Finish controller structure
Merge origin/master

Conflicts:
	app/controllers/MailController.php