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

Conflicts:
	Assets/Scene/Syrie.unity
	GTH-csharp.sln
	GTH.sln
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.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/36/3670efd228d514afcb4ca365cd70259f
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/47/47bb4669ad11abd5d00015498d76c639
	Library/metadata/49/492350616cfaf92459b20f464280a061
	Library/metadata/53/5334b7ecf5f64ad469eba83768f5237f
	Library/metadata/56/56c8b5b5da30c5b459178c54aa5427f8
	Library/metadata/6a/6a1d22b6e75660d41b0ad4d233e1da49
	Library/metadata/7a/7a00ee08eaf97ef48bd87f6fa51c11f3
	Library/metadata/9e/9ebf7b5a40bb1f746b4f2874b1f41ef2
	Library/metadata/b5/b536cd772a43de14ea7a5755f65073ce
	Library/metadata/cc/ccbd1c55841477c46974246b5df25809
	Library/metadata/ce/ceeda943761c3b348b77bbaeff180869
	Library/metadata/e0/e001f044dada842c5a54acd17cfc6dca