增加音乐同步
Merge branch 'chenyan'

Conflicts:
	AndroidManifest.xml