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

Conflicts:
	src/Novify/BackBundle/Resources/views/Caroussel/add.html.twig