refactoring project structure
Merge origin/master

Conflicts:
	Meetingroom/Controllers/AbstractController.php
	Meetingroom/Controllers/UserController.php
Merge origin/master

Conflicts:
	Meetingroom/Controllers/AbstractController.php
	Meetingroom/Controllers/UserController.php
Merge origin/master

Conflicts:
	Meetingroom/Controllers/AbstractController.php
	Meetingroom/Controllers/UserController.php
Merge origin/master

Conflicts:
	Meetingroom/Controllers/AbstractController.php
	Meetingroom/Controllers/UserController.php