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

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