audit
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/UserController.php
	models/User.php