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

Conflicts:
	Assembly-CSharp-Editor.csproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	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-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/guidmapper
	Library/metadata/00/0037fb28a18ee48479543710c4825208
	Library/metadata/00/004b2f2a13b57f9479752e670c1c931b
	Library/metadata/04/04e03b04a8d41224fb77882080163d4a
	Library/metadata/08/080d0fb7dbad33640a109610e36162d0
	Library/metadata/0d/0d2e301e74d3eb5429bf3ed5ad6585c4
	Library/metadata/10/1040e551a30be0a4c93693af2bcec46e
	Library/metadata/13/135509b4e3f1cea488e6401df1b4ea63
	Library/metadata/19/19bca71e7a951e34ba3d07874de0dad6
	Library/metadata/30/3095ed36444557749a3130ffa0078ffe
	Library/metadata/36/369925a1e3dec0b4593b194678686c23
	Library/metadata/46/467c4d03bf19c9e4da59bf8813797392
	Library/metadata/4b/4b1b75e8c45fe904fbf8ac5a25b3b80c
	Library/metadata/4f/4f01b31ef192b7841ab3844be76210d8
	Library/metadata/53/53ee4d296aea7f64bb15ce4c9288f160
	Library/metadata/54/54b0bba35f13a784aa6c14c62aadd294
	Library/metadata/61/618d9ad0303bb3946930c0d3fe16df71
	Library/metadata/61/61b296d212bc54d4f83d95e745a2314c
	Library/metadata/64/64314e1c96f497642b5cfba45e72657e
	Library/metadata/67/674f0bad1ba83a64d85e65f03560ea82
	Library/metadata/6c/6c394f2d0f7ceb44b8da90dc402a6005
	Library/metadata/6c/6ca05b928f9ee884a82e53e71ac7039f
	Library/metadata/71/7120748c671d3684c805d9f351026dc7
	Library/metadata/79/7982510b1468b7b478290c90605fd659
	Library/metadata/7d/7d05fd3e797fe1b46a2bb5c6e76cf5dd
	Library/metadata/8f/8f248ba7397a11c4cb21f06eed9fafc7
	Library/metadata/90/907c053d36a51ba42bb1bb74e4de5fe3
	Library/metadata/91/9139313edf1be9a4382917a8ffdc512f
	Library/metadata/96/96370d2beba3e2c4594b4e2e44bce961
	Library/metadata/97/97a51550766a1584da343353f6fce799
	Library/metadata/99/99466e43fd87a37489ac554a1a7af50a
	Library/metadata/9b/9bb94819640965941b3de72f0d52b0c8
	Library/metadata/9d/9d6445a155c574c42946794247a1d9ca
	Library/metadata/a3/a3b544432b502b144a239755a9db98f8
	Library/metadata/b1/b1a994dfc89d26b4a890ba23f352a07d
	Library/metadata/b6/b67257b6542d51149b5fc624828bc859
	Library/metadata/bb/bb4f3821925e74543830e05261cabc05
	Library/metadata/be/becc6419e15a2ba48a29d2ff17e3afc0
	Library/metadata/ce/cea654e1d6d893347b94d5b817a73360
	Library/metadata/ce/ceeda943761c3b348b77bbaeff180869
	Library/metadata/d3/d3dd9a1bf4b656e4f9fda493d60027cc
	Library/metadata/d8/d82c1250241245d4693ae99e3601a528
	Library/metadata/dd/dde02f814d87ee74889c575d23c86574
	Library/metadata/e5/e5c99c0df2c20a240967be358bead50c
	Library/metadata/f6/f6c0ed2b6b085934fb1179fac0e53309
	ProjectSettings/TagManager.asset