Fil d'ariane fully fonctionnel !
Merge branch 'master' of https://github.com/toborrow/glowing-happiness

Conflicts:
	Symfony/src/Resto/MainBundle/Resources/views/mainLayout.html.twig