Merge branch 'master' into chende
修改设备关联
修改设备关联
Merge branch 'chende' of https://github.com/chainton/pdm-client.git into
chende
Merge branch 'master' into chende
外网删除用户
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