修改
Merge branch 'master' of https://github.com/chainton/pdm-client.git

Conflicts:
	src/com/chainton/pdmclient/ConnectingDeviceActivity.java
	src/com/chainton/pdmclient/SetRouterActivity.java