bugfix
gui improvement
Merge branch 'development' of https://github.com/OFFIS-Automation/Framework into development