merge TSP + CHOCO
Merge branch 'master' of https://github.com/mehdif/OptimodLyon.git

Conflicts:
	src/controleur/Application.java
	src/modele/Point.java
	src/modele/Tournee.java
	xmlPourTests/livraison20x20-2_wellFormed.xml