Test
Merge branch 'master' of https://github.com/Degryll/ZBE

Conflicts:
	bin/Debug/ZBE.exe
	bin/Debug/ZBETest.exe
	builds/codeblocks/ZBE.workspace.layout
	builds/codeblocks/ZBETest/ZBETest.layout