Code optimizations
Merge branch 'master' of https://github.com/concrete-cp/concrete

Conflicts:
	src/main/scala/concrete/generator/ProblemGenerator.scala