Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/UserManageActivity.java
判断
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	src/com/chainton/pdmclient/ConnectDevicesActivity.java
	src/com/chainton/pdmclient/adapters/ConnectDevicesAdapter.java
。
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	src/com/chainton/pdmclient/ConnectDevicesActivity.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