Ajout de l'objet Trip + amélioration de l'affichage des solutions.
Merge branch 'master' of
git@github.com:IPierrot/Projet-d-option-GIPAD---Amadeus.git

Conflicts:
	Projet-d-option-GIPAD-Amadeus/bin/solving/SimpleComplexTripModel.class
	Projet-d-option-GIPAD-Amadeus/res/requests/request0.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request1.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request10.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request11.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request12.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request13.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request14.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request15.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request16.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request17.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request18.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request19.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request2.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request20.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request21.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request22.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request23.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request24.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request25.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request26.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request27.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request28.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request29.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request3.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request30.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request31.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request32.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request33.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request34.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request35.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request36.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request37.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request38.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request39.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request4.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request40.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request41.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request42.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request43.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request44.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request45.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request46.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request47.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request48.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request49.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request5.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request50.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request51.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request52.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request53.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request54.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request55.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request56.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request57.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request58.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request59.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request6.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request60.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request61.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request62.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request63.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request64.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request65.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request66.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request67.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request68.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request69.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request7.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request70.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request71.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request72.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request73.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request74.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request75.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request76.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request77.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request78.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request79.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request8.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request80.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request81.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request82.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request83.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request84.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request85.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request86.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request87.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request88.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request89.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request9.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request90.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request91.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request92.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request93.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request94.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request95.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request96.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request97.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request98.txt
	Projet-d-option-GIPAD-Amadeus/res/requests/request99.txt