음악 액티비티간 연관시킴
Merge branch 'choigoon' into develop

Conflicts:
	bin/MindViewer.apk
	bin/classes.dex
	bin/resources.ap_