Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/db/DBOpenHelper.java
个人空间视频，音乐
。
Merge branch 'chenyan'
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