old
Merge branch 'master' of github.com:boltphp/bolt

Conflicts:
	bolt
	src/bootstrap.php