Merge pull request #246 from ebbyw/Ebby

Ebby
Merge pull request #247 from ebbyw/Ebby

made some fixes to things I broke
Merge pull request #248 from ebbyw/Ebby

framerate change
opened unity

maybe compiled some stuff
Merge branch 'master' of https://github.com/ebbyw/ZooRush-beta

I see some conflicts with metadata files, if those screw anything up, I
guess we just roll back :)
Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.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/metadata/02/022477a85e71a4d0e892daeb46d43551
	Library/metadata/07/0770e13d2a8854c7ab1698cb1bb2b00a
	Library/metadata/0a/0a324fea7217346eb8bc1fb8f1d5ad2b
	Library/metadata/0a/0a794494d30414c1fb7a1c8f52a8f78f
	Library/metadata/0b/0b065749e45d44ade9246cd6af4e180e
	Library/metadata/0b/0b437966cd7f04b3aaefe88b0a650769
	Library/metadata/0b/0bcdd3bdcdc1f48afa63ccc79920deee
	Library/metadata/0d/0d7276f2379174fe3b9b7e3551f81b75
	Library/metadata/10/102a004293f924aafb12e0b8ff653584
	Library/metadata/12/123492632c2ec43efbb257666c378bd8
	Library/metadata/15/151006defaa3e4cd6adf1ae5ce09f9c7
	Library/metadata/16/164b1027a85564c39913abdc79b63bb1
	Library/metadata/1a/1acde6428cf364fe283475ad20930e1f
	Library/metadata/1b/1b345fd32a6eb45b6b52f306df73a771
	Library/metadata/1b/1bb5d5f6433034614b40bcf2431033b1
	Library/metadata/1b/1bc0f85d627854ce9b1e59712ebd2809
	Library/metadata/1e/1e33cdaeb87d74d0180496576c5420ac
	Library/metadata/1e/1eca9dd9e2b9c455e85eec5854408691
	Library/metadata/22/2239d513e34b24336a4753a39a2fc2de
	Library/metadata/22/22df9212cb37744978722d31f8311ada
	Library/metadata/24/24deb82db5fb34a7abccf9c0dfe9787a
	Library/metadata/25/257e2d0bf2b7f4b449ceab57b63a6092
	Library/metadata/27/2741c30b8f89945a9ab17a0e6fa19b26
	Library/metadata/27/27a4d82f10e6549f2a5ed745b9c3fe4c
	Library/metadata/28/2884aaa423b8c49558eb05399e4fd923
	Library/metadata/2c/2ce0d1322bde244219cd33ab786db642
	Library/metadata/2d/2d90032944d514c9eaf3acac588b1313
	Library/metadata/33/330b698f2d35c4b89978a7419c8765f0
	Library/metadata/34/3469394ff03ac47bda6f7e4fde2eef4c
	Library/metadata/35/3550b88d0cff84289bfc6262abcd1099
	Library/metadata/35/356b580dc5f9440258b4edd1f6b06762
	Library/metadata/37/37827c8c6948f4ea9acec58287212a9b
	Library/metadata/38/38f5f5a99a0784ad5a40dbf0157f7d0f
	Library/metadata/3d/3d9b6c439ac19447ab1696ab054ff0a2
	Library/metadata/40/4011e87d20d43406e8d7a2073617dcaa
	Library/metadata/40/40a1b5e27b00e4a8ba9ee4c98cf1e026
	Library/metadata/43/435003bc53fe54cfa8549738219e59e7
	Library/metadata/44/448dbbc90ed144929a97f2314895ea35
	Library/metadata/46/4698500bfd23e438f9852e4f2690819b
	Library/metadata/47/47c5e3b963d644ef1ac475573af92fa7
	Library/metadata/4b/4b4d0dfc493964a78a659bcd1966c9b9
	Library/metadata/4d/4d3d5ae9d38c34eafb9ec85c5e7bb183
	Library/metadata/4e/4e5c83cefb14c4dfa9d7b34a82981639
	Library/metadata/4f/4f398045902bd4a7dbb22f7e230d8999
	Library/metadata/50/50d111f5b5d9f4c4da03458053a4c1d3
	Library/metadata/52/520dcb04ff97d42fda74a1d3aec7b533
	Library/metadata/52/527a849fadae243858e36964a0c55eca
	Library/metadata/52/52a8a2eac7abc423da422c1c633763a2
	Library/metadata/53/536d142b12cc744e9848e4019be4ba7e
	Library/metadata/55/5517de6f149c54b308881dd3097910a9
	Library/metadata/56/56d0dd0f83c6b4d8ca879e10d395c75f
	Library/metadata/56/56e3228a6334d436c804276aeee7888c
	Library/metadata/57/5712b21e552304b8cada6a6eb96e4266
	Library/metadata/59/593af68535d1a4c09b89b5f083b3be4c
	Library/metadata/59/59ddcf5f4202e4d26bceb20ced1dc349
	Library/metadata/5d/5d4f1657a603447b38f29711b600d90e
	Library/metadata/60/60e7cfd7bf5184489a82cf10417f2039
	Library/metadata/64/64ea3af8cb6a844d4b2c42f192d49131
	Library/metadata/65/65da5472c72d84511b5c6f2f23345380
	Library/metadata/66/669c67944faa747909ac8cf4f5ac5b19
	Library/metadata/68/68d3b3ba2efa6424a9d2d45002381e21
	Library/metadata/6b/6b55f02d08d244c52a7bde4e23c7d516
	Library/metadata/71/71c064af8454747f599caea4efb3ac41
	Library/metadata/73/7326f37c63af34c4b88e186dd6e855e7
	Library/metadata/74/74c505a25bcc14f8a96fec58fcc7e8fb
	Library/metadata/74/74f6165cdc31346198c015a45d1ecc71
	Library/metadata/76/76c68ea4fc98247b6951a12a430e83fe
	Library/metadata/78/784aad15258d34709963140e92fcd50b
	Library/metadata/79/79f33e57f1ed8433f9ee2c868daaeab9
	Library/metadata/7a/7a00543f8ce1e423c966e4516380b5fa
	Library/metadata/7e/7e785ff4bdda04bbaa61aab24b99f8bc
	Library/metadata/7f/7f43c711fcfd84ff6934f5b9249ff224
	Library/metadata/81/81af2ef3eb1aa4a2da2673e0c3fc65ca
	Library/metadata/81/81bb5e1978f1e4d2b831002c3f01070c
	Library/metadata/82/82b6f98dc33f54d768c31b8b1d97659a
	Library/metadata/85/8585b690d615a472ca32215d10ff73d3
	Library/metadata/88/8834767cc946847f8bda0c1d3795c2a3
	Library/metadata/8a/8a3e29cfa651342bb94c5ce28ba1d01b
	Library/metadata/8a/8a6bd5a45d8b1479da9c1f31736d5a98
	Library/metadata/8a/8a7555b0602d64d0bb482d0458bfb0f0
	Library/metadata/8b/8b87f13b3dbd442559f67c070ad58c78
	Library/metadata/8c/8c9668534fb4b4966823bf64c9886bab
	Library/metadata/8e/8e338e7005d5c4b9198db9d769f2ecd3
	Library/metadata/8f/8ff23c692bb9242b0933edc4c565f4ae
	Library/metadata/91/91996addc5647454f813b44ea0949ab7
	Library/metadata/94/946e809d41022480bbb4294e797e011b
	Library/metadata/94/94fc915d901664d8f8c84cedb88615ed
	Library/metadata/95/9527ad47cd0a947cfb95c9568e278093
	Library/metadata/97/9792ca9d13c83463e8bf5fbadd32d162
	Library/metadata/97/97a84df2468bb466b893eea1deebd4c5
	Library/metadata/98/981a2537aa1ea451287b0529699c15f8
	Library/metadata/98/98e3d6c292b69489d83dac9f49c672aa
	Library/metadata/99/99bd7bee35c82439abe12032599a57bc
	Library/metadata/9c/9c2deac804b3846469859cbdd148ea2e
	Library/metadata/9f/9f7bf13c54f8e43e985c2935e55580c5
	Library/metadata/9f/9ff0a5e93bf034ee89eb1755443f70f1
	Library/metadata/9f/9ff27db64c0d748df8fa10719b2dc088
	Library/metadata/a3/a31d3c6024602475f804cf83e233bd9f
	Library/metadata/a5/a5543430d07814c6692a572a725cc962
	Library/metadata/a6/a6cda60086f4d47cb87fb5ea7b14448c
	Library/metadata/aa/aa92ae88d821a4851a4400a068313e99
	Library/metadata/ab/ab078019798984e6a8d2147f64d0958c
	Library/metadata/ab/ab3055039232b4ff7a08a5ab39755bd6
	Library/metadata/ac/aca0964da7322472c96ecf1b884b9e6a
	Library/metadata/ad/ad2189e50721f402bb953cedfbf67e9a
	Library/metadata/b0/b00888986a5364d6388d8209baaa218c
	Library/metadata/b2/b20f2d470e2e24b19b5369fb3548183f
	Library/metadata/b2/b296296ceff114820b77ec3e422f95cb
	Library/metadata/b3/b34cfa396158c4f6094180ecab8bee2e
	Library/metadata/b7/b7ca723cb249241b4bbbc5c7ce9e6944
	Library/metadata/b8/b80ca87b544144ee7a622d2f55898a63
	Library/metadata/b8/b86f8b01bdd3c423aafef6295af52cc6
	Library/metadata/bb/bb67392ec7725414aba4bd75253b7d58
	Library/metadata/bc/bcd7121655123435daa7bec3b05af57b
	Library/metadata/bc/bcddf9a5420c24d948fdf2eaa9328cc0
	Library/metadata/bd/bd9862608e3d840199f6475fb9fd73ca
	Library/metadata/be/be5819cdefc454ec380f284d64d5ea80
	Library/metadata/c0/c0b79f47896364545a192faa093e234e
	Library/metadata/c1/c17f387a9eb7645e083b0c4c25bcc43f
	Library/metadata/c2/c2b2ffde8102143a0a71dbb9ed2f74b7
	Library/metadata/c4/c4ae47736844644089f4f5c7b5c2f3a0
	Library/metadata/c7/c71734f0852724890b6d136d23ffb775
	Library/metadata/c7/c782ac56f3916463da7eb3c7f20d8284
	Library/metadata/c7/c7c2a62e23a3f474582058ff757f7b11
	Library/metadata/c8/c82c1f9d1444445758322516c0e22d7a
	Library/metadata/c9/c9793767b01d847e496b52e193d52a57
	Library/metadata/cb/cb5a105645b3b44db9a720b9e1c16476
	Library/metadata/cc/cc14072e5fed44cadaf062ad2f7bd48c
	Library/metadata/cd/cded93957377141c787ea24ee6bca616
	Library/metadata/cf/cf05fdedb035a452297c9d593c7aa307
	Library/metadata/d0/d02a3701e947e487fac368529b2b3aee
	Library/metadata/d0/d04a10753dcf34c03830e1ba9aab0f91
	Library/metadata/d0/d05453793b35147349f4692e9e131560
	Library/metadata/d0/d0aaf250c164949a4a7566fbebee2387
	Library/metadata/d5/d5dacf87e272d4a50aaafd372a13ed89
	Library/metadata/d9/d951e51563feb4fb3b2ed2ece614578d
	Library/metadata/dc/dc65a3000ecf449e0804f0e97d4d213d
	Library/metadata/dd/dd632bf08de84401fb7567b0c01c881d
	Library/metadata/de/de3789768cf2145a3a49680dc05a7546
	Library/metadata/e1/e123bd9f6856641e79cc0707c71b4c87
	Library/metadata/e8/e8be99451a5fb4923b8d55df09073c18
	Library/metadata/e9/e957cbbf08e434f38b7a5e91ff8b7007
	Library/metadata/eb/eb846e64223bf4701b0e5bb6d4727449
	Library/metadata/eb/ebb66ca3002d94c81a128629547bf19a
	Library/metadata/ed/ed961fd2bbb5f4c76b19e0754807f320
	Library/metadata/f0/f0eac40c985a643018b967e66625b138
	Library/metadata/f1/f1dac5cb4448a4cc3a05037860ad8641
	Library/metadata/f2/f225980a7805b4d978873e0d25649e70
	Library/metadata/f4/f4036537442d2445f81536b0c9b7fd4e
	Library/metadata/f4/f4483625872a949599033f385d9b6635
	Library/metadata/f4/f4e530e13da46478e95c3ea362eb93ce
	Library/metadata/f6/f649c6f0fb0f34fb9ae62c27d21a241c
	Library/metadata/f7/f7b6877704cee482bace610f58e20b31
	Library/metadata/fb/fb2913dc0ec954fdebda57cbb317a100
	Library/metadata/fe/fe20648c9ae504ae69aa5d968fd437d9
	Library/metadata/fe/fe4f5b66fbf194b75b2800c082964f74
Merge branch 'master' 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
	ZooRush-beta-csharp.sln
	ZooRush-beta.sln