users and passwords changes / getUser
Merge remote-tracking branch 'origin/master'

Conflicts:
	serveur/controllers/userController.php