Merge pull request #268 from ebbyw/Ebby

Ebby
Merge pull request #269 from ebbyw/Ebby

Endless Mode work
big update

potential problems!
one more
Merge branch 'master' into Ebby

Conflicts:
	Assets/Scenes/Levels/Endless Mode/Endless-Zoo.unity
	Assets/Scripts/EndlessAnimal.cs
	Assets/Scripts/EndlessModeEndMenu.cs
	Assets/Scripts/EndlessPainIndicator.cs
	Assets/Scripts/EndlessSceneManager.cs
	Assets/Scripts/Level Gameplay/NetHandler.cs
	Assets/Scripts/Level Gameplay/NetLauncher.cs
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/0d/0d39e2380fc8c4aba9fd45e1330935ee
	Library/metadata/26/266f8e57f9602443d8e3dfdbbfb0160a
	Library/metadata/37/37fc0d425b9be4ef494a0ae3865641e4
	Library/metadata/46/4650b884a471541fba92e3b9a3771637
	Library/metadata/4e/4ec1fd236477944e7a973a44be7faf3e
	Library/metadata/58/588d89e964152453ab660caa146b1b72
	Library/metadata/59/591cd245bd30d4fb38832bf0e8d2067f
	Library/metadata/70/705c65278bb8343d7bfdc8309ea15521
	Library/metadata/82/827363d193af549cda8d788d0325ee56
	Library/metadata/85/8539dde1ab47a4f38bbb090e8c2d6384
	Library/metadata/95/955fd8b0b8ed1406cacf591c15547c53
	Library/metadata/97/9700c5a2cde9847d88496fd89a676f02
	Library/metadata/9e/9e439f34435d34a25bdee06d7df73ddf
	Library/metadata/a4/a4029ca9987f74ee3aa67e3fba09e712
	Library/metadata/a4/a4812a9ecb87a4e5da382ff0a8b93353
	Library/metadata/ad/ad99f1328f1bb4ef4931673e66a275fe
	Library/metadata/c2/c2d4b88cefa57407d9edb88047a84139
	Library/metadata/c8/c84e30d315aa84747909d1914ce2f69a
	Library/metadata/cc/cc80790bd08c44fe89f46d776d8aa56c
	Library/metadata/d1/d1a0ee6aa19ca479ab063431383e7abc
	Library/metadata/db/dbf8d2a504e9541569c87efdc704d0a9
	Library/metadata/e1/e1cbcad5804804640b53c5b36aa2a9f7
	beta-csharp.sln
	beta.sln
	beta.userprefs