删除Activity
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
删除本地数据
删除本地数据
去掉PdmClientMessage类型参数
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	src/com/chainton/pdmserver/db/DBOpenHelper.java
修改