Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/db/DBOpenHelper.java
联系人的还原
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 remote-tracking branch 'origin/master' into chenyan

Conflicts:
	src/com/chainton/pdmserver/util/MyUtils.java