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

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	GTH-csharp.sln
	GTH.sln
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/metadata/25/2556dd753aec5da438700c82950ccad8
	Library/metadata/3e/3e744d5d08a0b0440a8fb7877212fb85
	Library/metadata/49/492350616cfaf92459b20f464280a061
	Library/metadata/64/644a98afee6c37d46a09c59310ad627c
	Library/metadata/79/79d3082a49ae09f4e9479cee9f82d05f
	Library/metadata/7a/7a00ee08eaf97ef48bd87f6fa51c11f3
	Library/metadata/7a/7a53ddad19087b64fa6d1d66d787b716
	Library/metadata/89/89f9f32492b42094ca4910528be66f96
	Library/metadata/9b/9bb94819640965941b3de72f0d52b0c8
	Library/metadata/b5/b536cd772a43de14ea7a5755f65073ce
	Library/metadata/d7/d785b4dd9940e8b44b5b584816e5e91b
	Library/metadata/e7/e7edfa4e44c50ec4b9ba2b9a1a030c8e
	Library/metadata/ea/ea6da4a0ebadb704691a6fa2d03f817b
	Library/metadata/fd/fd09a553c8dbbde4a975c0651ee5a073