Fixed API and Integration Tests
Merge branch 'master' of github.com:meip/bettermeeting

Conflicts:
	app/models/MeetingFormats.scala