增加视频图片短信备份，删除个人空间通话记录的显示
增加视频图片短信备份，删除个人空间通话记录的显示
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	src/com/chainton/pdmserver/db/DBOpenHelper.java
修改
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
	src/com/chainton/pdmserver/db/services/RelatedDeviceDBService.java
Merge branch 'master' into chende

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