RAZ
Merge branch 'master' of https://github.com/Wibellule/Sdz

Conflicts:
	UserBundle/Controller/SecurityController.php