Merge origin/master

Conflicts:
	app/Model/User.php
Merge origin/master

Conflicts:
	app/Model/User.php