Merge branch 'chende'

Conflicts:
	res/values/strings.xml
	src/com/chainton/pdmclient/LoginActivity.java
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java
修改同步开关的读取
Merge remote-tracking branch 'origin/master' into chenyan

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

Conflicts:
	src/com/chainton/pdmclient/MyHomeActivity.java
修改默认值
Merge branch 'chenyan'
删除代码
Merge branch 'chenyan'
修改
Merge branch 'chenyan'
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/LoginActivity.java
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java