added user controller methods
Merge branch 'master' into rspec
nunya