Add support for combining different diversity measures and constraint…#189

Dekker1 merged 2 commits intoMiniZinc:developMiniZinc/minizinc-python:developfrom

ilansen:develop-upilansen/minizinc-python:develop-upCopy head branch name to clipboard