filter + refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	Meetingroom/Controller/EventController.php