Merge branch 'master' of https://github.com/barif/Meeting

Conflicts:
	Meetingroom/Models/AbstractModel.php
Merge remote-tracking branch 'origin/master'