修改
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
增加删除的在线推送
增加删除消息接受