CS fixes
Merge remote-tracking branch 'origin/0.8'

Conflicts:
	app/Http/routes.php