ajout son menu
Merge branch 'master' of https://github.com/bossdbz/GTH

Conflicts:
	Assets/Script/ArmÃ©nie/world.js
	GTH-csharp.sln
	GTH.sln
	GTH.userprefs
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	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/3e/3e744d5d08a0b0440a8fb7877212fb85
	Library/metadata/59/59bf2d61fbc84f04db61dd99700e4044
	Library/metadata/6a/6a3c8fbb457c6064785db4204ca6bf11
	Library/metadata/9b/9bb94819640965941b3de72f0d52b0c8