Merge branch 'master' into chende
用户删除
用户删除
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
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
删除用户
Merge branch 'chende'

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