qq

qq
Merge remote-tracking branch 'origin/Judas' into Judas

Conflicts:
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/EditorUserSettings.asset
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll.mdb
	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/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/04/0428f8f60fa9fc44fbc83b1388991bca
	Library/metadata/06/060c6ffc19c4a85419b435c253943b26
	Library/metadata/09/0939ed6c7613e5e43a5cdc04a678a966
	Library/metadata/0a/0a4a878577c88654795d8c6aee74368d
	Library/metadata/11/1194fd1dee01cc44791f666ee9e55e82
	Library/metadata/11/11fd2f5f82efa334b8c7526990ad0829
	Library/metadata/12/12707ac5173525e4a8d3c94ccc075120
	Library/metadata/14/144032073d79c0644914a9fa2b44ce33
	Library/metadata/16/166a6573b9e1af94d9d80649d7ab4cb4
	Library/metadata/17/17cce1f47f1e9b044805b5c407473540
	Library/metadata/22/229bf0b71cf1843deb29e2e82226fdc9
	Library/metadata/25/259f314f7e29f404194fb5feb0db68c8
	Library/metadata/2a/2acd1137a22f8a64c9e83c97a5218410
	Library/metadata/2b/2b73db293718c486cad21a3c89ffc9be
	Library/metadata/33/3362b65bb63704e4e8ad728de890ac8e
	Library/metadata/33/338dc9d5d607922459febc874f7cdde8
	Library/metadata/37/3774cc94a7541624d944cd986e8cbbeb
	Library/metadata/38/387b1f4819cf2b146818ad4e90466bef
	Library/metadata/3d/3dd55a0006e9039448f1347c119c4f8f
	Library/metadata/42/421eb519f0e01488183536e50bac34e1
	Library/metadata/45/45a241f72ce2fc54b8f17ce1989d54ea
	Library/metadata/49/49bb92e9ae6e84f6ca7a0c01adb53a49
	Library/metadata/4c/4ca30958001189a47b753cd7c97ea4f9
	Library/metadata/4e/4ebf30e4fd68ee241a84d3144c9a751f
	Library/metadata/54/54683a277497945b08d62b93ba4505c3
	Library/metadata/57/5705f2fc1302ea340a90c9525cc0428b
	Library/metadata/59/59a98dcd48d674ef28175efd2360578d
	Library/metadata/5a/5adf436f1db584ec5be048ea4f9c7c1f
	Library/metadata/5d/5d0d5a79d4579bf43adc7a5e5ae2c265
	Library/metadata/5f/5f476afb313054cec8cd4595bfb7700d
	Library/metadata/62/62b37f86a251e104d8704f066ace43c8
	Library/metadata/65/65bd97dd8b34607499602aa3f4f6bd15
	Library/metadata/6a/6a40a37f6200640e9a8b147a78862e47
	Library/metadata/70/70927d33d507aba49aebc0d14203bfd9
	Library/metadata/72/72b9f7c26ab84b04fae75326d64ad02a
	Library/metadata/72/72bc8ac93a22ed54a8dcbfd77fac944d
	Library/metadata/77/7796b5d0fa4b9c941a30d8012a555db1
	Library/metadata/7e/7e2a41a51a4383e4bb2c307cb3530064
	Library/metadata/7e/7e5905228a16e4ba890d6c623cf952c4
	Library/metadata/80/80e33a1e2ddaf784bb327d3b90f13c6f
	Library/metadata/83/8307261b94c5d8a4f99775a836199d20
	Library/metadata/8e/8eb087eac6c311849805e327193938fb
	Library/metadata/8f/8f319427fb8c6bc4fbfefbb758857d4f
	Library/metadata/93/93441d9f2d5914ffd989a1459d03754d
	Library/metadata/94/9482ed6aa80d9af44b0d5e1eb84f9af2
	Library/metadata/97/973fb17297d010146af4af0cd454610b
	Library/metadata/9c/9c3e8740d05b6ea41961e3e0f519c4eb
	Library/metadata/9d/9dea8a158a69bed4fa95c4876b3a9c86
	Library/metadata/a2/a299596c90b594c93961e2d9696788d1
	Library/metadata/a7/a7dc886d37ae54b1d8032980ceb2be86
	Library/metadata/aa/aacacbc1b20d60f4394fc753c8d93d6a
	Library/metadata/ab/abab5f22d6161cc40bd4874581add4a4
	Library/metadata/b6/b658c1273576f4c2785b88932bf6cc8f
	Library/metadata/b7/b7df7987c76f4134aa7cefabb0190843
	Library/metadata/c1/c1555cf6982b43c4694cb751add74f86
	Library/metadata/c2/c221cfc7b1e0b9649bbfd7f9323f78f8
	Library/metadata/c3/c372e5b966afa6d4a886020f4a92a255
	Library/metadata/c9/c9a7cb90494fbeb49a4e08b15aad1e63
	Library/metadata/cb/cbc33ba6cfb5ee24eb319b49f07a6356
	Library/metadata/cf/cf99d9bbf078b9740a88a7583e1be6e4
	Library/metadata/d4/d4d2f535cbcc68a439c13d5619448180
	Library/metadata/d5/d59d4100db38f0f42bb18063c8387586
	Library/metadata/d7/d76cce1d794620346b2ef8868ec101e5
	Library/metadata/db/db1cc8e6429a94094b4ab0dfbe51c152
	Library/metadata/dc/dcaf99179a75b504da8cc139318de270
	Library/metadata/dc/dcfc5e881232e564c8b468a9fe02a443
	Library/metadata/dd/dd46caf43c8d490408ecdd70a7248699
	Library/metadata/e1/e105c41297ecc4803b256d1c08e5f98b
	Library/metadata/e2/e2d31ef068c658b4ab4a078d492d26b0
	Library/metadata/e4/e4e97d23f9bd614429d7e119e5d3cc51
	Library/metadata/e8/e848bde348597c04ea54f211251b3ee4
	Library/metadata/e9/e950636c300acaa45a3365cbe5b186ab
	Library/metadata/e9/e954360201fae44858857a0b3bceb891
	Library/metadata/eb/eb719bb6431494073987f573f49ffeed
	Library/metadata/ee/ee72fbea51aca2f40b0e33c8ad517ecd
	Library/metadata/f8/f867568a37234ca448db1b23770f5752
	Library/metadata/f8/f8d20bb09931d44639f0203ce6a8095a
	Library/metadata/f9/f907b334e8611264eae38e94ef687f38
	Savior-Of-Souls-csharp.sln
	Savior-Of-Souls.sln
	Savior-Of-Souls.userprefs
	Temp/UnityTempFile-09e986b5f7fe74ee48221b9a9e7f673a
	Temp/UnityTempFile-0ebaf2d228e3b4ad58ff81835a5752b3
	Temp/UnityTempFile-245443eb3eec7408abc6ee81712bdfd0
	Temp/UnityTempFile-29d8f908aa84545518e6ce01d0ff7036
	Temp/UnityTempFile-2cad3818188fa4e6e9f1ddfe1798f40f
	Temp/UnityTempFile-3c0af978cb3cb47108c8bc436d6a151b
	Temp/__EditModeScene
	Temp/bin/Debug/Assembly-CSharp-Editor-firstpass.dll
	Temp/bin/Debug/Assembly-CSharp-Editor-firstpass.dll.mdb
	Temp/bin/Debug/Assembly-CSharp-Editor.dll
	Temp/bin/Debug/Assembly-CSharp-Editor.dll.mdb
	Temp/bin/Debug/Assembly-CSharp.dll
	Temp/bin/Debug/Assembly-CSharp.dll.mdb
	Temp/bin/Debug/Assembly-UnityScript.dll
	Temp/bin/Debug/Assembly-UnityScript.dll.mdb