récupération travaux nico
Merge branch 'master' of https://github.com/bossdbz/GTH

Conflicts:
	GTH-csharp.sln
	GTH.sln
	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-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/64/644a98afee6c37d46a09c59310ad627c
	Library/metadata/7a/7a53ddad19087b64fa6d1d66d787b716
	Library/metadata/cc/ccf14548c8b9b414992fa1eecb5a6266