更改删除数据值
Merge branch 'chende'
是否删除数据
Merge branch 'chende'
Merge branch 'master' into chenyan

Conflicts:
	src/com/chainton/pdmclient/adapters/RelatedDevicesAdapter.java