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

Conflicts:
	Assembly-CSharp-Editor.csproj
	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-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/56/56c8b5b5da30c5b459178c54aa5427f8
	Library/metadata/61/618d9ad0303bb3946930c0d3fe16df71
	Library/metadata/b6/b67257b6542d51149b5fc624828bc859
	Library/metadata/ce/ceeda943761c3b348b77bbaeff180869