Merge remote-tracking branch 'origin/develop' into develop

de.prob.units/build.properties

@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               icons/,\
                plugin.xml

de.prob2.units.feature/feature.xml

@@ -224,7 +224,7 @@ litigation.
    </license>
 
    <requires>
-      <import feature="de.prob2.feature" version="2.3.5.qualifier"/>
+      <import feature="de.prob2.feature" version="2.3.5" match="greaterOrEqual"/>
    </requires>
 
    <plugin