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
。
Merge branch 'master' into chende