Repercution des modifs pour l'admin gen
Merge branch 'master' of git://github.com/iloWeb/IlowebPartnerBundle

Conflicts:
	Resources/views/Admin/index.html.twig