test
Merge branch 'master' of https://github.com/dpp972/attractif
Merge branch 'master' of https://github.com/dpp972/attractif

Conflicts:
	src/MainBundle/Controller/FrontController.php