ADDED user#profile and test cases
Merge branch 'master' of github.com:josephktcheung/grasshopper into angular
ADDED current_user api
Merge branch 'master' of github.com:josephktcheung/grasshopper into angular
UPDATED apprenticeships#show api
Merge branch 'master' of github.com:josephktcheung/grasshopper into angular

RESOLVED Conflicts in	app/controllers/users_controller.rb
SHOWED id in users#show.json
COMMENTED out users#destroy route
RENAMED getCurrentUser.coffee to currentUser.coffee; UPDATED currentUser factory
ADDED csrf authToken to angular_config
UPDATED IndexCtrl
UPDATED UserCtrl
UPDATED edit-profile template
UPDATED user model, controller to accept update request
UPDATED index template
REMOVED asset_helpers config
Merge branch 'master' of github.com:josephktcheung/grasshopper into angular

RESOLVED conflicts in	app/views/users/show.json.rabl
Merge branch 'master' of github.com:josephktcheung/grasshopper into angular

RESOLVED conflicts in	app/views/layouts/application.html.slim &	app/views/site/index.html.slim
UPDATED SearchCtrl getCurrentUser to currentUser
ADDED nested routes