cyril updates
Merge branch 'master' of https://github.com/dpp972/attractif
erge branch 'master' of https://github.com/dpp972/attractif

Conflicts:
	nbproject/project.properties
	nbproject/project.xml
Merge branch 'master' of https://github.com/dpp972/attractif

Conflicts:
	src/FrontOfficeBundle/Resources/views/Default/baseFront.html.twig
	src/FrontOfficeBundle/Resources/views/Default/index.html.twig
	src/FrontOfficeBundle/Resources/views/Default/nav.html.twig
update main