Merge branch 'develop' of github.com:chocoteam/choco3 into develop
issue#253: proposal
issue#253: JLiangWaterloo comments
issue#253: JLiangWaterloo comments
Merge branch 'pr_iss253' of github.com:chocoteam/choco3 into pr_iss253
Merge commit '36554f8b0a9a702232ca0054566f728de0e5475c' into feature_MCR

Conflicts:
	choco-solver/src/main/java/org/chocosolver/solver/constraints/set/PropIntMemberSet.java
	choco-solver/src/main/java/solver/constraints/set/PropIntEnumMemberSet.java
	choco-solver/src/main/java/solver/constraints/set/PropIntMemberSet.java