No big changes
Update Lib
Merge remote-tracking branch 'origin/master' into Blake

Conflicts:
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/3d/3db594cdc5b948148b5cfbfbe5d24ff9
	Library/metadata/8a/8ad4fde643dedf044bef9c602d2d1017
	Library/metadata/93/93e56b43b8b552f4a951eddc5aef6229
	Library/metadata/95/95f64fe1b36f38844968205cd224d72d
	Library/metadata/af/af6cc0ac9fda0f3438a8c6cfc9b204a7
	Library/metadata/db/db5cf87521c18e8458571900b703f4fd
Merge branch 'Blake' of https://github.com/blakelmyers/Surround into Blake

Conflicts:
	Assets/Scripts/Camera Scripts/CameraScript.js
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/16/163fcaf6c7702774180d36a9877e4e59
	Library/metadata/18/18214e9d6af6248559d501391856f1c7
	Library/metadata/1c/1cb386729bc85984690ac140a7d35565
	Library/metadata/25/25309963374f9904d81c1d9aabff31a1
	Library/metadata/2c/2c528fec5d95e4ac28cf46399b887662
	Library/metadata/31/311aef303b7ab9342b7beb700da57b74
	Library/metadata/31/3186f38ca67e7441e8299da2e169f9f9
	Library/metadata/44/440eb36db91ca410f800ff3cfe43572f
	Library/metadata/47/471eaf7442f04ec49946332a6f0866c2
	Library/metadata/4c/4c85abd0a4d974473b97e81d10a3a6bc
	Library/metadata/4f/4f3c3069684f10d49860aae6939d2cd9
	Library/metadata/4f/4f98907c10fcbb146a579e7ee5da7d2d
	Library/metadata/52/527393b10fb66418bbaa072e104f5a30
	Library/metadata/54/54e03e659ab274dd9b12c0538a9c4983
	Library/metadata/57/5710a1f47af2947699139509aae39149
	Library/metadata/57/5780fb5dc2d9dc94c96cddba43598abb
	Library/metadata/66/6685d213dcd37451eaa7643f63089046
	Library/metadata/67/6714de3203c79bd40b9c4e41d14e62dc
	Library/metadata/7e/7e6f84bf81c8d4de280f1133cff7e601
	Library/metadata/8a/8ad4fde643dedf044bef9c602d2d1017
	Library/metadata/8c/8c8d414db0a941044b2cd5ffc2ea6b42
	Library/metadata/93/93e56b43b8b552f4a951eddc5aef6229
	Library/metadata/95/95f64fe1b36f38844968205cd224d72d
	Library/metadata/ac/ac865f55780124eeabc4a99d6d0b0115
	Library/metadata/b9/b9133c02b23852e409c50465ff8cdd17
	Library/metadata/bf/bfd675cc0db1d4656b75dc6d6ba91142
	Library/metadata/c1/c1ff30f791c6e9b4b9abb3aa856dafcc
	Library/metadata/c6/c6e0767b1f8c34890ac245217f4b9731
	Library/metadata/c9/c907370d0664c1b479b7ace79a885fb3
	Library/metadata/cb/cba4562cece794697b418ce8e7c04b3c
	Library/metadata/d2/d29f6876b2be6a649a6827a31de5c85c
	Library/metadata/d6/d6cdc79ec19714fcd980ca3f6ac01a0a
	Library/metadata/db/db5cf87521c18e8458571900b703f4fd
	Library/metadata/dd/dd2a1c4b201f9fc40a6b888ea6f6f280
	Library/metadata/e5/e5bdb6135a74b444d8cebd065dbf9d08
	Library/metadata/f0/f0788b2d51ca3fc4298d38386df28324
	Library/metadata/f2/f2af333648c334319bd43c214449ab50
	Library/metadata/f7/f7d5f039a8e7848e889e1546d37dc39e
Fix bad merge
Update Main Menu
Added more to Main Menu, and started Tutorial scene
Added different color dinos to main menu
Clicking Dinosaur launches mapscene, and playerType is passed
Can select from two types per server or client.  Tutorial scene mostly complete
Added basic photon networking to main menu
updated to get photon working in map scene
Fixed tutorial issues from last merge
Fixed player 2 camera and added waiting for player 1
commit dll
Merge remote-tracking branch 'origin/Blake'