change users_controller
Merge branch 'hung'
fix privilege
Merge branch 'master' of github.com:github15693/rcs