Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectSettings/ProjectSettings.asset

Merge remote-tracking branch
'origin/master'

Conflicts:
	ProjectSettings/ProjectSettings.asset

fixed missing loop music
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectSettings/ProjectSettings.asset