admin.html updates
Merge branch 'master' into testing

Conflicts:
	html/admin.html