Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.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