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

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Script/ArmÃ©nie/world.js
	GTH-csharp.sln
	GTH.sln
	GTH.userprefs
	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/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/49/492350616cfaf92459b20f464280a061
	Library/metadata/61/61b296d212bc54d4f83d95e745a2314c
	Library/metadata/9b/9bb94819640965941b3de72f0d52b0c8
	Library/metadata/b5/b536cd772a43de14ea7a5755f65073ce