Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Application.scala
	app/domain/people/Facilitator.scala
	build.sbt
	test/TestAdmin.scala
	test/TestConversation.scala
	test/TestFacilitatorType.scala
	test/TestMembers.scala
	test/TestPerson.scala
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Application.scala
	app/domain/people/Facilitator.scala
	build.sbt
	test/TestAdmin.scala
	test/TestConversation.scala
	test/TestFacilitatorType.scala
	test/TestMembers.scala
	test/TestPerson.scala
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/CreateAdminController.scala
	app/controllers/PersonController.scala
	app/controllers/RoleController.scala
	app/controllers/SpecialityController.scala
	app/controllers/SponsorController.scala
	app/models/ChannelModel.scala
	app/models/FacilitatorModel.scala
	app/models/FacilitatorTypeModel.scala
	app/models/MembersModel.scala
	app/models/PersonModel.scala
	app/models/RatingsModel.scala
	app/services/crudservices/AdminCRUD.scala
	app/services/crudservices/ChannelCRUDInterface.scala
	app/services/crudservices/ConversationCRUDInterface.scala
	app/services/crudservices/FacilitatorTypeCRUDInterface.scala
	app/services/crudservices/MembersCRUDInterface.scala
	app/services/crudservices/PersonCRUD.scala
	app/services/crudservices/PersonCRUDInterface.scala
	app/services/crudservices/RatingsCRUDInterface.scala
	app/services/crudservices/RoleCRUD.scala
	app/services/crudservices/RoleCRUDInterface.scala
	app/services/crudservices/SpecialityCRUDInterface.scala
	app/services/crudservices/SponsorCRUDInterface.scala
	conf/routes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Application.scala
	app/domain/people/Facilitator.scala
	build.sbt
	test/TestAdmin.scala
	test/TestConversation.scala
	test/TestFacilitatorType.scala
	test/TestMembers.scala
	test/TestPerson.scala