Merge branch 'develop' into feature-rop
update to antlr4 (tests not migrated yet)
speed up parser
Fixed PropIntMemberSet
Merge pull request #108 from JLiangWaterloo/fix-propintmemberset

Fixed PropIntMemberSet

Indeed I missed a return statement after line 169
Your fix does the job, thanks
We are refactoring propagators so that most of them become idempotent, 
I hope it is the only bug I have introduced...
Merge branch 'feature-rop' into develop
fix setPassive
Merge branch 'feature-sc' into develop
udpate database schema
Merge branch 'feature-sql' into develop
Merge branch 'develop' of github.com:chocoteam/choco3 into develop
fix bug in bool2int
fix bug with empty sets
still fix
Merge branch 'feature-fixMax' into develop
change col order in sql
Merge branch 'develop' of github.com:chocoteam/choco3 into develop
fix subcircuit
parser modif (from maven)
Merge branch 'feature-fixsc2' into develop