syncing
switching PCs
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

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
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

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
Dialog system changes and framework overhauling
opened unity on another computer
Merge branch 'Ebby' of https://github.com/ebbyw/ZooRush-beta into Ebby

Conflicts:
	Library/CurrentLayout.dwlt
	beta-csharp.sln
	beta.sln
Game State Machine changes
major code cleanup
fixed settings and player controls
Merge pull request #257 from ebbyw/Ebby

Ebby