not entirely sure.
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
	Library/guidmapper
	Library/metadata/35/356b580dc5f9440258b4edd1f6b06762
	Library/metadata/3e/3e88159f594ba4b8c822baf677b27a5b
	Library/metadata/45/457200cd94d11404b889acf6db6b6f86
	Library/metadata/4e/4e5c83cefb14c4dfa9d7b34a82981639
	Library/metadata/79/79f33e57f1ed8433f9ee2c868daaeab9
	Library/metadata/91/91996addc5647454f813b44ea0949ab7
	Library/metadata/94/946e809d41022480bbb4294e797e011b
	Library/metadata/96/96ab8fb8934f04fc0843911f1232c307
	Library/metadata/9f/9ff0a5e93bf034ee89eb1755443f70f1
	Library/metadata/a5/a5543430d07814c6692a572a725cc962
	Library/metadata/b0/b00888986a5364d6388d8209baaa218c
	Library/metadata/cb/cb5a105645b3b44db9a720b9e1c16476
	Library/metadata/cd/cded93957377141c787ea24ee6bca616
	Library/metadata/d0/d02a3701e947e487fac368529b2b3aee
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln