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

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
test
Merge branch 'master' of https://github.com/bossdbz/GTH

Conflicts:
	GTH-csharp.sln
	GTH.sln
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper