lkgfasjkòbskvgjsf
Merge
Merge branch 'master' of https://github.com/smariani/Seagull

Conflicts:
	app/Controller/AppController.php
App Controller