Merge branch 'master' into Ebby
Merge branch 'master' into Ebby

Conflicts:
	Assets/Scenes/Levels/Level1-Tutorial.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

Conflicts:
	Assets/Scenes/Levels/Level1-Tutorial.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln
more help menu work
metaa
help menu work
help menu work
help menu work - animal catching
help menu work

animal set completed
help menu work last stages
help menu work done
Merge branch 'Ebby'

Conflicts:
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	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/expandedItems
	Library/guidmapper
	Library/metadata/bf/bfa8b25d3b7f94dcaab986e9d8a62d4e