Merge origin/master

Conflicts:
	Meetingroom/Controller/AbstractController.php
	Meetingroom/Controller/EventController.php
	Meetingroom/View/Resource/index.php
	Meetingroom/View/Resource/user/login.php
Merge origin/master