Merge origin/master

Conflicts:
	app/Controller/PathsController.php
	app/View/Users/login.ctp
Merge origin/master