Merge branch 'chende'

Conflicts:
	src/com/chainton/pdm/data/enums/ResType.java
	src/com/chainton/pdm/data/model/SyncSwitch.java
注销删除关联设备
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