Update the user controller
Merge branch 'master' of github.com:anodyne/nova3