Laser works
Merge branch 'master' of https://github.com/azatris/zed

Conflicts:
	zed-csharp.sln
	zed.sln
	zed.userprefs