同步
Merge branch 'master' of https://github.com/LouiLam/KingClient

Conflicts:
	KingClient/src/com/zjd/universal/net/GameClient.java