Adjustments for /munkiwebadmin subpath
Merge branch 'master' of https://github.com/eahrold/munkiwebadmin

Conflicts:
	manifests/views.py