edit UserController
Merge origin/master