完善音乐和礼品功能
Merge remote-tracking branch 'origin/master'

Conflicts:
	admins/material/tpl/mod_material_add.htm