acl & session begin
Merge remote-tracking branch 'origin/master'

Conflicts:
	Meetingroom/Controllers/UserController.php