Nick's changes.
Merge branch 'master' of github.com:craftsmancoding/assetmanager

Conflicts:
	assets/css/mgr.css