Merging
Merge branch 'master' of https://github.com/LostEncoding/ProjectZed

Conflicts:
	Zed/Library/CurrentLayout.dwlt
	Zed/Library/assetDatabase3
	Zed/Library/guidmapper
	Zed/Zed-csharp.sln
	Zed/Zed.sln