Merge branch 'master' into chende
外网读取连接设备
Merge remote-tracking branch 'origin/master' into chenyan
增加断开设备连接接口
修改
修改Ip
外网连接
Merge branch 'master' into chende

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