Merge branch 'master' into chende
删除帐号
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	src/com/chainton/pdmserver/threads/ClientMsgHandleThread.java
Merge branch 'master' into chende