Merge in djphil's patch, thanks djphil.
Merge branch 'Frozen' of github.com:aurora-sim/Aurora-WebUI into Frozen

Conflicts:
	AuroraService/addon-modules/AuroraWebUI/Modules/WebUIHandler.cs
Merge in velus' changes, thanks.