Fixing music and scene bugs.
Merge branch 'old-working-copy' of https://github.com/GoldenCity/GoldenCityGameMain4_16_9_23AM into old-working-copy

Conflicts:
	Assembly-UnityScript.pidb
	GoldenCityGameMain4_16_9_23AM.userprefs