Merge branch 'MH-454' into dev
Fix conflicts after merging MH-502 to Master
Merge branch 'MH-502' into dev
Fix conflicts after mergin MH-436
Merge branch 'MH-344' into dev
Merge branch 'dev' of github.com:thelabtech/missionhub into dev
Merge branch 'master' into dev
Fix conflicts after merging MH-423
Merge branch 'api' into dev

Conflicts:
	config/routes.rb
	test/functional/contacts_controller_test.rb
Merge branch 'dev' of github.com:thelabtech/missionhub into dev
Merge branch 'master' into dev

Conflicts:
	test/functional/contacts_controller_test.rb
Merge branch 'api' into dev
Fix conflicts after merging MH-507 to dev
Merge branch 'api' into dev
Merge branch 'api' into dev
Update Schema
Fix conflict after merging master to dev
Merge branch 'MH-512' into dev
Fix conflicts after mergin MH-502 to Dev
Fix conflicts after mergin MH-502 to dev