Fixed some failing tests in user spec
Merge branch 'master' of github.com:jingar/sample_app