changes to build settings

removed downtown set prefab causing error
Merge branch 'master' of https://github.com/ebbyw/ZooRush-beta

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln