Change in CSPOM API
Merge branch 'master' of https://github.com/concrete-cp/concrete-examples

Conflicts:
	src/main/java/allDiffDec/AllDiffDec.java
	src/main/java/golombruler/JGolombRuler331.java
	src/main/java/pigeons/Pigeons.java
	src/main/java/queens/Queens.java
	src/main/java/rb/RBGenerator.java
	src/main/scala/bigleq/BigLeq.scala
	src/main/scala/carseq/CarSeq.scala
	src/main/scala/crossword/CrosswordGenerator.scala
	src/main/scala/golombruler/GolombRuler.scala
	src/main/scala/groups/Groups.scala
	src/main/scala/knapsack/Knapsack.scala
	src/main/scala/nontransitivedice/NonTransitiveDice.scala
	src/main/scala/openshop/OpenShopGenerator.scala
	src/main/scala/queens/MQueens.scala
	src/main/scala/queens/QueensAllDiffCSPOM.scala