update
Merge branch 'master' of https://github.com/maaaark/visionward

Conflicts:
	app/controllers/BaseController.php