bad merge :'(
title for parts
Merge branch 'dev' into lan

Conflicts:
	src/AfterEpi/AdminBundle/Resources/views/Admin/index.html.twig
	src/AfterEpi/LanBundle/Resources/views/Admin/index.html.twig