Merge branch 'master' into chende
用户删除
Merge branch 'master' into chende
ClientMsgHandleThread
ClientMsgHandleThread
删除用户
删除用户
Merge branch 'chende' of https://github.com/chainton/pdm-server.git into
chende
删除用户
Merge branch 'chende'

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
Merge remote-tracking branch 'origin/master' into chenyan