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