edit user view and controller
erge branch 'master' of https://github.com/AkermanGreg/happy