Some Tileset Box work
Merge branch 'master' of git@github.com:Wohlhabend-Networks/PlatGEnWohl.git

Conflicts:
	Editor/mainwindow.h