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

Conflicts:
	Gulpfile.js
	app/Http/Controllers/Auth/AuthController.php
	app/Http/Controllers/HomeController.php
	app/Http/routes.php
	composer.json
	package.json