included user helper in user controller
included forgery protection line in user controller
Merge branch 'master' into rspec_user