committing trailing changes
Merge branch 'master' of https://github.com/ebbyw/Tester

Conflicts:
	Library/CurrentLayout.dwlt
	Tester-csharp.sln
	Tester.sln
	Tester.userprefs