Bug fixes.
Merge branch 'old-working-copy' of https://github.com/GoldenCity/GoldenCityGameMain4_16_9_23AM into old-working-copy

Conflicts:
	Assembly-CSharp-Editor.pidb
	Assembly-CSharp-firstpass.pidb
	Assembly-UnityScript-firstpass.pidb
	Assembly-UnityScript.pidb
	GoldenCityGameMain4_16_9_23AM.userprefs