opened unity
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.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/metadata/44/448dbbc90ed144929a97f2314895ea35
	Library/metadata/64/64ea3af8cb6a844d4b2c42f192d49131
	Library/metadata/7b/7bda1f0f402e14cd9ae02ecb26758009
	Library/metadata/c4/c4ae47736844644089f4f5c7b5c2f3a0
Merge branch 'master' into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.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/metadata/44/448dbbc90ed144929a97f2314895ea35
	Library/metadata/64/64ea3af8cb6a844d4b2c42f192d49131
	Library/metadata/7b/7bda1f0f402e14cd9ae02ecb26758009
	Library/metadata/c4/c4ae47736844644089f4f5c7b5c2f3a0
some game state related bugs fixed

moving objects don’t move during dialog
fixed character speed when stopwatch is active  but close enough to
catch animal
forgot to close mlnodevelop
Merge pull request #141 from ebbyw/Ebby

Ebby