Address controller
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/services/CoordinatorServiceTest.scala
Merge remote-tracking branch 'origin/master'
Address controller