add tuple choice for times constraint
Fix tuple generation in makeScalar + Tuples ranges
Merge with 'develop'
Merge with 'develop'
Merge branch 'feature-mzn' into develop