change
Merge branch 'master' of github.com:traviskuhl/bolt

Conflicts:
	src/bolt/settings.php