Syrie
Merge branch 'master' of https://github.com/bossdbz/GTH

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Scene/Syrie.unity
	GTH-csharp.sln
	GTH.sln
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000001000000000000000
	Library/metadata/36/3670efd228d514afcb4ca365cd70259f
	Library/metadata/3e/3e744d5d08a0b0440a8fb7877212fb85
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/47/47bb4669ad11abd5d00015498d76c639
	Library/metadata/49/492350616cfaf92459b20f464280a061
	Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	Library/metadata/b5/b536cd772a43de14ea7a5755f65073ce
	Library/metadata/ce/ceeda943761c3b348b77bbaeff180869
	Library/metadata/e0/e001f044dada842c5a54acd17cfc6dca