subtype icons, status modal and more
Merge branch 'humbucker' of github.com:blueriver/MuraCMS into humbucker

Conflicts:
	admin/assets/css/admin.min.css