latest commit

mc diary and mobileauth
Merge remote-tracking branch 'origin/master'

Conflicts resolved:
	app/controllers/MobileAuthController.php
	app/controllers/MobileController.php
	app/routes.php