correction userController
Merge origin/master