Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/UserManageActivity.java
。
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmclient/adapters/ConnectDevicesAdapter.java
修改服设备和用户的数目
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/ConnectDevicesActivity.java
	src/com/chainton/pdmclient/UserManageActivity.java
	src/com/chainton/pdmclient/adapters/ConnectDevicesAdapter.java
	src/com/chainton/pdmclient/xmpp/client/XMPPClient.java
.