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

Conflicts:
	GTH-csharp.sln
	GTH.sln
	GTH.userprefs
	Library/CurrentLayout.dwlt
	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/9b/9bb94819640965941b3de72f0d52b0c8