ADDED noty notification message on edit profile
ADDED ability to get list of active, pending, and inactive apprenticeships
's user names.
UPDATED file upload, seeds.rb
Merge pull request #53 from josephktcheung/editProfile

Edit profile
CHANGED array of apprenticeships to include user objects instead of name.
Merge branch 'master' into bow
UPDATED seeds.rb
FIXED seeds.rb
FIXED bugs in various pages
ADDED noty notice after sending a message
FIXED bugs in conversation
REFACTORED code in searchCtrl
Merge pull request #54 from josephktcheung/search-bugfix

Search bugfix
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
FIXED apprenticeship API for now
FIXED conversation api for now
Merge pull request #55 from josephktcheung/apprenticeship-api

Apprenticeship api
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.