Merge branch 'master' into chende
远程登录
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	res/layout/set_router.xml
	res/values/strings.xml
	src/com/chainton/pdmclient/SetRouterActivity.java
。
Merge branch 'chenyan'

Conflicts:
	res/layout/set_router.xml
	res/values/strings.xml
	src/com/chainton/pdmclient/SetRouterActivity.java
修改
修改
Merge branch 'master' into chende

Conflicts:
	res/values/strings.xml
	src/com/chainton/pdmclient/SetRouterActivity.java
	src/com/chainton/pdmclient/contstant/BroadcastActions.java
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java