tets

xx
Merge remote-tracking branch 'origin/master'

Conflicts:
	CloudManagerFull.v12.suo
	bin/Debug/CloudManagerFull.exe
	bin/Debug/CloudManagerFull.pdb
	obj/Debug/CloudManagerFull.csproj.FileListAbsolute.txt
	obj/Debug/CloudManagerFull.csproj.GenerateResource.Cache
	obj/Debug/CloudManagerFull.exe
	obj/Debug/CloudManagerFull.pdb