cache commit
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Socket_test/obj/x86/Debug/Client1.csproj.GenerateResource.Cache