no message
Merge branch 'master' of https://github.com/novify/batmania

Conflicts:
	src/Novify/FrontBundle/Resources/views/Front/index.html.twig
Merge branch 'master' of https://github.com/novify/batmania
réadaptation sans le menu
Merge branch 'master' of https://github.com/novify/batmania

Conflicts:
	src/Novify/FrontBundle/Resources/public/css/style.css
Merge branch 'master' of https://github.com/novify/batmania

Conflicts:
	src/Novify/FrontBundle/Resources/public/css/style.css