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

Conflicts:

	VEServer/VEServer/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	VEServer/VEServer/obj/x86/Debug/VEServer.csproj.FileListAbsolute.txt