Added a Parameterized class for consistency between Expression and Constraint parameters
Added a Parameterized class for consistency between Expression and Constraint parameters
Merge branch 'master' of https://github.com/concrete-cp/cspom

Conflicts:
	src/main/scala/cspom/CSPOM.scala
	src/main/scala/cspom/flatzinc/FZVarType.scala
	src/main/scala/cspom/variable/IntDomain.scala
	src/main/scala/cspom/variable/IntVariable.scala