added spec_helper and fixed UserController tests
Merge branch 'user'