change users_controller
Merge branch 'hung'