[merge]
Merge remote-tracking branch 'origin/master'

Conflicts:
	kur/WebUI/bin/WebUI.dll
	kur/WebUI/bin/WebUI.pdb
	kur/WebUI/obj/Debug/WebUI.csprojResolveAssemblyReference.cache
	kur/WebUI/obj/Debug/WebUI.dll