Merge remote-tracking branch 'gogo/master'

# Conflicts:
#	src/components/music/musicIndex.vue
#	src/types/musicType.ts