Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/db/DBOpenHelper.java
	src/com/chainton/pdmserver/db/services/MediaCloneDBService.java
	src/com/chainton/pdmserver/service/MediaService.java
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/util/MyUtils.java
增加标记联系人收藏字段
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/db/services/MediaCloneDBService.java
	src/com/chainton/pdmserver/db/services/MmsCloneDBService.java
	src/com/chainton/pdmserver/service/MmsService.java
。