Merge branch 'chende'

Conflicts:
	res/values/strings.xml
	src/com/chainton/pdmclient/LoginActivity.java
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/LoginActivity.java
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java
用户注销时，删除switch开关值
Merge branch 'chende'
Merge branch 'chende'
去掉所有资源是否同步过的判断
Merge branch 'chende'
Merge remote-tracking branch 'origin/master' into chenyan