Udpate for changed CSPOM API
Merge branch 'master' of https://github.com/concrete-cp/concrete

Conflicts:
	src/main/java/rb/RBGenerator.java
	src/main/scala/concrete/runner/ConcreteRunner.scala
	src/main/scala/concrete/runner/FZRunner.scala
	src/main/scala/concrete/runner/RandomMDD.scala
	src/main/scala/javax/constraints/impl/Problem.scala
	src/test/scala/concrete/constraint/semantic/OccurrenceTest.scala
	src/test/scala/concrete/generator/constraint/AbsDiffGeneratorTest.scala
	src/test/scala/concrete/generator/cspompattern/AbsDiffTest.scala
	src/test/scala/concrete/generator/cspompattern/AllDiffTest.scala
	src/test/scala/concrete/generator/cspompattern/DiffGeTest.scala
	src/test/scala/concrete/generator/cspompattern/MergeEqTest.scala