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

Conflicts:
	Assets/Script/ArmÃ©nie/world.js
	Library/CurrentLayout.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/32/32ca4f8d2ae19394fbb3e592929dfec1
	Library/metadata/42/42da3525ec8babf4ba2f526416010f36
	Library/metadata/4c/4c5b249528a10b14eae9c6617937bb27
	Library/metadata/90/9066ddf1f9c52884a88e90750e962549
	Library/metadata/9b/9bb94819640965941b3de72f0d52b0c8
	Library/metadata/e0/e001f044dada842c5a54acd17cfc6dca
	Library/metadata/e2/e21bdf4c78cc67f4392d0b4a27a36fdf