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

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	GTH-csharp.sln
	GTH.sln
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/1a/1a0b1c0796f043b42bf90b81956295cd
	Library/metadata/22/226bed662523a154da1745ef8fa7b8e5
	Library/metadata/3b/3bc548b98d296bf4290ea0ac2a50fb9b
	Library/metadata/3e/3e744d5d08a0b0440a8fb7877212fb85
	Library/metadata/40/4015a18d666f1eb46b790b110bac0112
	Library/metadata/59/59bf2d61fbc84f04db61dd99700e4044
	Library/metadata/6a/6a3c8fbb457c6064785db4204ca6bf11
	Library/metadata/76/76150f8b7ccb2c149a0d1b9d92f80fef
	Library/metadata/7a/7a4e229c1518e4d4faa076c414a61788
	Library/metadata/9b/9bb94819640965941b3de72f0d52b0c8
	Library/metadata/aa/aa15da0b1794a8146b8ee2e15fcb7606
	Library/metadata/ae/aeb80e0aaec3c7440b52a58a96ce0c59
	Library/metadata/dc/dcd7d02445772434388251ff40ec1103