Merge origin/master
Merge origin/master

Conflicts:
	Meetingroom/Controller/EventController.php