Merge branch 'Emerald'

Conflicts:
	config/App.php