[UPDATE] Toute les new url (normalement)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controller/ManifestationController.php
	Controller/UserController.php
[UPDATE] Redef mot de passe + autre truc + BIG BIG merge