外网删除数据
修改服设备和用户的数目
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/threads/ClientMsgHandleThread.java
	src/com/chainton/pdmserver/xmpp/client/XMPPClient.java