Merge branch 'configuration'

Conflicts:
	Config/bootstrap.php