Résolution bug git
Résolution bug git (suite)
Merge branch 'master' of https://github.com/wario4/gics

Conflicts:
	src/gics/SiteBundle/Resources/views/Index/index.html.twig