Arménie : parcour opérationnel
Merge branch 'master' of https://github.com/bossdbz/GTH

Conflicts:
	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-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/ce/ceeda943761c3b348b77bbaeff180869