Restaurant <==> Theme OK!
Merge branch 'master' of https://github.com/toborrow/glowing-happiness

Conflicts:
	Symfony/src/Resto/MainBundle/Controller/RestoController.php