suppression des condition foireuses
Reso conflits
Merge branch 'master' of https://github.com/tyhupo/tripbooker into dev

Conflicts:
	src/M2TIIL/TripBookerBundle/Controller/DefaultController.php
resolution confit
[controller] ajoue recherche