Merge remote-tracking branch 'origin/master' into v2.x

Conflicts:
	lib/pom.xml
	pom.xml

diff --cc dep/org.argeo.suite.dep.ui.rap/pom.xml
index d6c3dc1cfe62763b7c229a6d2f1e23fdce4e40f6,a70a582902de3525625afe0a2f05c5253b46b037..34f4abef2029186347fb30a501a26a6f78b87337
--- 1/dep/org.argeo.suite.dep.ui.rap/pom.xml
--- 2/dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@@ -25,9 -25,16 +25,16 @@@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
 -                      <version>2.3.1-SNAPSHOT</version>
 +                      <version>2.1.20-SNAPSHOT</version>
                </dependency>
  
+               <!-- Argeo Suite Icons -->
+               <dependency>
+                       <groupId>org.argeo.suite.icons</groupId>
+                       <artifactId>org.argeo.suite.icons.default</artifactId>
+                       <version>${version.argeo-suite-icons}</version>
+               </dependency>
+ 
                <!-- Argeo Suite -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>

diff --cc lib/pom.xml
index cf590829c39d5a1c93f4eac0a987304a75cf69a0,b3a10b9e617c68085c089b02a0653676fbc74876..56048e6b09f773c748405be7c3e7ad8a7087aa96
--- 1/lib/pom.xml
--- 2/lib/pom.xml
+++ b/lib/pom.xml
@@@ -15,9 -15,10 +15,10 @@@
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
 -              <version.argeo-commons>2.3.1-SNAPSHOT</version.argeo-commons>
 +              <version.argeo-commons>2.1.101</version.argeo-commons>
+               <version.argeo-suite-icons>2.1.0</version.argeo-suite-icons>
  
 -              <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo</argeo.rpm.stagingRepository>
 +              <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <dependencies>

diff --cc pom.xml
index 1944bddb4f8c4d2795533d221b27a261ddecd9b0,63e46ffa33dfca7197d364307c9d9c0fdb441b3f..952753f3e6f725747e47af8a217f28392e2ca119
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -15,9 -17,10 +15,10 @@@
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
 -              <version.argeo-commons>2.3.1-SNAPSHOT</version.argeo-commons>
 +              <version.argeo-commons>2.1.101</version.argeo-commons>
+               <version.argeo-suite-icons>2.1.0</version.argeo-suite-icons>
  
 -              <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
 +              <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <modules>