ajout des users
Merge branch 'master' of https://github.com/matthieuHanne/epi

Conflicts:
	Symfony/src/Epi/AdminBundle/Resources/views/Default/users.html.twig