CHANGED apprenticeship.is_active to apprenticeship.status in schema and migration and ADDED rspec tests.
CHANGDED apprenticeship rabl to include status.
ADDED getting list of apprenticeships to IndexCtrl.
Merge branch 'master' of https://github.com/josephktcheung/grasshopper into bow
ADDED nesting for apprenticeships in user.
FIXED conversation and apprenticeship nesting in user.
FIXED conversation and apprenticeship nesting in user.
ADDED ability to get list of active, pending, and inactive apprenticeships
's user names.
CHANGED array of apprenticeships to include user objects instead of name.
Merge branch 'master' into bow
MOVED uploader function to a factory
FIXED text displayed on bow button for existing apprenticeships.
Merge branch 'master' into bow

Merged conflicts with existing master.

Conflicts:
	app/assets/javascripts/angular/controllers/SearchCtrl.coffee
	app/assets/templates/edit-profile.html.slim
Merge branch 'master' of github.com:josephktcheung/grasshopper into AddSkills
Merge branch 'master' into bow

Conflicts:
	app/controllers/apprenticeships_controller.rb
	app/controllers/conversations_controller.rb

  MERGED functioning API changes.
ADDED master role and apprentice role validations to apprenticeship model and ADDED tests.
FIXED apprenticeship test cases for master and apprentice.
ADDED Accept bow functionality.
FIXED bow button functionality on view-profile page.
Merge branch 'master' into bow

FIXED conflicts.

Conflicts:
	app/assets/javascripts/angular/controllers/ViewProfileCtrl.coffee
	app/assets/templates/view-profile.html.slim