Merge branch 'master' into chende
外网删除用户
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/xmpp/client/XMPPClient.java
外网删除用户
外网删除数据