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
Merge branch 'master' into chenyan

Conflicts:
	src/com/chainton/pdm/data/messages/enums/PdmClientMessageType.java
	src/com/chainton/pdm/data/messages/enums/PdmServerMessageType.java
修改
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	src/com/chainton/pdm/data/model/RelatedDevice.java
.
Merge remote-tracking branch 'origin/master' into chenyan
.
。
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdm/data/model/RelatedDevice.java
Merge branch 'chende'

Conflicts:
	src/com/chainton/pdm/data/model/RelatedDevice.java