up
Merge branch 'master' of github.com:traviskuhl/bolt-assets

Conflicts:
	lib/assets.php
Merge branch 'master' of github.com:traviskuhl/bolt-assets

Conflicts:
	controllers/assets.php
wrok