test
Merge branch 'master' of github.com:boltphp/core

Conflicts:
	src/bolt/browser/assets.php
	tests/bolt/browser/assetsTest.php