Merge pull request #106 from ebbyw/Ebby

Ebby
prefab changes, scene changes
Merge branch 'master' of https://github.com/ebbyw/ZooRush-beta

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Level 7 update

balancing
Update to tutorial
not much
Merge branch 'master' into Ebby

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Resources/Prefabs/GUI/Story Mode/Level 4.meta
	Assets/Scenes/Level1-Tutorial.unity
	Assets/Scenes/Level2-Zoo.unity
	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/guidmapper
	Library/metadata/07/0740098c3f32a494090ba588266f0fe2
	Library/metadata/08/0820e73e1c3d540c594ed922c04cc1a1
	Library/metadata/0b/0bcdd3bdcdc1f48afa63ccc79920deee
	Library/metadata/15/15b64e13a5ce243aa9373fc1b355e694
	Library/metadata/18/184a5ad876b9b4687bbd2c7bed4213a6
	Library/metadata/23/2373bbc3a13d349579d05475be48fd11
	Library/metadata/2f/2f2dd6cbfb48a4b68ac5c4584770a8fe
	Library/metadata/30/302a61e28ecf94f0cb6a34f6dd41628e
	Library/metadata/3f/3fa125e1aec7b485b89bddbd033a7941
	Library/metadata/49/49b6189dd291440a995d19c95e1b1e4a
	Library/metadata/58/586caf85dc56145c984e81d4142469a6
	Library/metadata/59/59ddcf5f4202e4d26bceb20ced1dc349
	Library/metadata/66/6656012c107a043318e2d5e99f45b6eb
	Library/metadata/7e/7e785ff4bdda04bbaa61aab24b99f8bc
	Library/metadata/80/8004b61d1cebe4c58b8df0051a1bd437
	Library/metadata/81/81af2ef3eb1aa4a2da2673e0c3fc65ca
	Library/metadata/83/833bc88762d5d458bb36da306fea80ad
	Library/metadata/83/838942c00b1bb4b2b9d716d369a75063
	Library/metadata/85/85d7584b25116473e891514ae8023636
	Library/metadata/89/89ff360bd9bb44957a8616833a63b211
	Library/metadata/8c/8c9668534fb4b4966823bf64c9886bab
	Library/metadata/93/9314d75fdf7fd436cae93d948e44a6cd
	Library/metadata/a2/a2ddca3e6c5c14633a24ee53106c58e1
	Library/metadata/ac/aca461024ed274d109990580a1ae87f3
	Library/metadata/bc/bc1c5369db641417cb508c6ac059f06a
	Library/metadata/cd/cdb8e52cc98704418aadde5d336bf595
	Library/metadata/d0/d09634ea972304072a28ff4eae0bc23e
	Library/metadata/dc/dc402b4a5fd274b478cc8a74af314023
	Library/metadata/de/deb968c2295854cc0bd7cb3160800b2f
	Library/metadata/e1/e1d6c17423fbc41b085a1b7b5fcb430a
	Library/metadata/eb/eb9f6022f5e2a416aa4ab49df611442c
	Library/metadata/fd/fda4c7a3512d34f37aa397176e187625
	Library/metadata/fd/fdf7ead72b9db48c782ddb447c315d32
	Library/metadata/ff/ffb5af09d0eaf46898e199d263caebac
	ProjectSettings/EditorBuildSettings.asset
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln