Choco3RP finished
ChocoCustom3RP on going
Merge branch 'master' of https://github.com/julien-marchand/BestPlace

Conflicts:
	src/main/java/gipad/scheduling/EntropyProperties.java