Merge branch 'Judas'

Conflicts:
	Assets/Scenes/SoulPage.unity
	Assets/UI Script/DropObjectDataBase.cs
	Assets/UI Script/DropObjectDataBase.cs.meta
	Library/CurrentLayout.dwlt
	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/05/055c78c04cad84ec59f4560158031248
	Library/metadata/1b/1bdf831adea8d49b4b3191eab7f3d060
	Library/metadata/21/21ce27631f8fa42bea50ee15b804d00a
	Library/metadata/6d/6d8213d944e844a67852ceb77d2ac74e
	Savior-Of-Souls-csharp.sln
	Savior-Of-Souls.sln
	Savior-Of-Souls.userprefs
	Temp/UnityTempFile-2f029065aac8c4d0f9524c04f204f1ea
	Temp/UnityTempFile-ea8b6b14205dd4db3a789ccca18a6bc5
	Temp/UnityTempFile-f50017d66ee0e4987bc164f823e3e6c6
	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