是否删除数据
Merge branch 'chende'
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java