Maj FicheBundle
Merge branch 'master' of https://github.com/monsieurp74/Gamesite

Conflicts:
	src/Gam/UserBundle/Controller/UserController.php