Merge remote-tracking branch 'origin' into search_and_user_controller
added create, show, update actions for users controller
added shallow:true to apis routes, deleted create route for reviews/comments under nested resources
Merge remote-tracking branch 'origin' into users_controller
Merge pull request #11 from mule-deer-2014/users_controller

Users controller