Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdm/data/messages/enums/PdmClientMessageType.java
	src/com/chainton/pdm/data/messages/enums/PdmServerMessageType.java
	src/com/chainton/pdm/data/model/SyncSwitch.java
注销时，删除switch值
Merge branch 'master' into chenyan

Conflicts:
	src/com/chainton/pdm/data/messages/enums/PdmClientMessageType.java
	src/com/chainton/pdm/data/messages/enums/PdmServerMessageType.java