Integ front + back modif
Merge branch 'master' of github.com:alphalayer/CASA

Conflicts:
	app/config/config.yml
	src/TalentGourmand/FrontBundle/Resources/views/layout.html.twig