.
修改
。
。
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmclient/ConnectDevicesActivity.java
	src/com/chainton/pdmclient/LoadingActivity.java
	src/com/chainton/pdmclient/adapters/ConnectDevicesAdapter.java
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java