Gestion des plats
Merge branch 'master' of https://github.com/toborrow/glowing-happiness

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