修改
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmclient/system/service/SystemMediaService.java
Merge branch 'chenyan'
Merge remote-tracking branch 'origin/master' into chenyan