adds users_controller spec
Merge branch 'master' into tests