,erge branch 'maquette' of git://github.com/MartinLG/PeopleAreTravelling into voyage

Conflicts:
	app/AppKernel.php
	app/config/routing.yml
Commit Voyage modifier un voyage, duree auto
ajout des form et view manquante