Merge branch 'chende'

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

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