"minor" changes to GUI
merge haxx
Merge branch 'master' of https://github.com/Isnah/Gruppe39.git
this is shit...