price, VAT, discount

Merge remote-tracking branch 'upstream/develop'

Conflicts:
	app/Http/Controllers/AuthController.php
	app/Http/Kernel.php
	app/Providers/RouteServiceProvider.php
	app/User.php
	gulpfile.js