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

Conflicts:
	GTH-csharp.sln
	GTH.sln
	GTH.userprefs
	Library/AssetServerCacheV3
	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/expandedItems
	Library/guidmapper
	Library/metadata/07/073c91b7063726043a971fd9a7bd898e
	Library/metadata/10/10dd563d12db0304bae2bf751a8b6aa2
	Library/metadata/18/18c8d1a505a185b4b80651ef9f691d5b
	Library/metadata/56/56c8b5b5da30c5b459178c54aa5427f8
	Library/metadata/5f/5fb1f3eda16ea8345ad32e7eed71cb84
	Library/metadata/6a/6a3c8fbb457c6064785db4204ca6bf11
	Library/metadata/7d/7d61339676d977047b32c742ec4fcd97
	Library/metadata/89/89f9f32492b42094ca4910528be66f96
	Library/metadata/b3/b3a0e705280784e21ba512c7f58b67cc
	Library/metadata/b9/b94cda674a71f5a479d7ec84ec0fc3d0
	Library/metadata/fd/fd09a553c8dbbde4a975c0651ee5a073
	ProjectSettings/TagManager.asset