Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	app/Http/Controllers/Auth/AuthController.php
	app/User.php