checker:wgh
Merge branch 'master' of https://github.com/szwghqq/ZjhClient

Conflicts:
	com/dozengame/net/SocketService.java