merge-update of trunk and disabling GUI-Control separation
fix delete of classifications
smaller fixes
had to rename the packages to make them compliant with buckminster