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