Some work on the user controller and model
Merge branch 'master' of github.com:rtoal/chuzr
Merge branch 'master' of github.com:rtoal/chuzr because Frodo JUST PUSHED