diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index b5ec28b8ea..dde91103cb 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.base"
       label="Adempiere Base"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -18,50 +18,50 @@
 
    <includes
          id="org.compiere.db.provider"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <includes
          id="org.adempiere.payment.processor"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <includes
          id="org.adempiere.pipo"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <includes
          id="org.adempiere.replication"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <includes
          id="org.adempiere.report.jasper"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <plugin
          id="org.adempiere.base"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.base.callout"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.base.process"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.extend"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -69,7 +69,7 @@
          id="org.adempiere.ui"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -250,7 +250,7 @@
          id="org.adempiere.install"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <plugin
          id="org.eclipse.osgi.services"
diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF
index 9f2744691c..d1d1f12d10 100644
--- a/org.adempiere.base.callout/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Callout
 Bundle-SymbolicName: org.adempiere.base.callout
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0"
 Eclipse-RegisterBuddy: org.adempiere.base
 Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF
index c56ab2413a..3cf5fe2a79 100644
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Adempiere Processes
 Bundle-SymbolicName: org.adempiere.base.process
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0"
 Export-Package: org.adempiere.process,
  org.compiere.process,
  org.idempiere.process
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 2c2804fbdc..38c11743ab 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.adempiere.base
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: base.jar,
  bsh-2.0b5.jar,
  bsh-engine.jar,
diff --git a/org.adempiere.bundles.external-feature/feature.xml b/org.adempiere.bundles.external-feature/feature.xml
index d8cfac5a5e..0fa62f5f0c 100644
--- a/org.adempiere.bundles.external-feature/feature.xml
+++ b/org.adempiere.bundles.external-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.bundles.external"
       label="External bundles"
-      version="2.0.0.qualifier"
+      version="2.1.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF
index c6af8b471c..eb9d43df16 100644
--- a/org.adempiere.extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.adempiere.extend
 Bundle-SymbolicName: org.adempiere.extend;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: extend.jar,
  spiffy-with_source-all-0.05.jar
 Eclipse-RegisterBuddy: org.adempiere.tools
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: compiere.model,
  test
-Fragment-Host: org.adempiere.base;bundle-version="2.0.0"
+Fragment-Host: org.adempiere.base;bundle-version="2.1.0"
 Eclipse-PatchFragment: true
 Import-Package: junit.framework;version="3.8.2",
  org.junit;version="4.8.2",
diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF
index e903563c72..14b100381e 100644
--- a/org.adempiere.install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: install
 Bundle-SymbolicName: org.adempiere.install;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: install.jar,
  ant-contrib-1.0b3.jar
 Export-Package: org.adempiere.install,
  org.compiere.install
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.mail;version="1.4.5",
  javax.mail.internet;version="1.4.5",
diff --git a/org.adempiere.payment.processor-feature/feature.xml b/org.adempiere.payment.processor-feature/feature.xml
index 183b6d2450..ea3a77b5e6 100644
--- a/org.adempiere.payment.processor-feature/feature.xml
+++ b/org.adempiere.payment.processor-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.payment.processor"
       label="Payment Processor"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,14 +17,14 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.1.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.payment.processor"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
index 7fcfd809d1..3462a61222 100644
--- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF
+++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Processor
 Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0"
 Bundle-ClassPath: jpayment.jar,
  payflow.jar,
  Verisign.jar,
diff --git a/org.adempiere.pipo-feature/feature.xml b/org.adempiere.pipo-feature/feature.xml
index c4ef91aacd..3a05f4ef06 100644
--- a/org.adempiere.pipo-feature/feature.xml
+++ b/org.adempiere.pipo-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.pipo"
       label="Pipo-feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,28 +17,28 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.1.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.pipo"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.pipo.handlers"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.plugin.utils"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
index bb377b05c1..83bb37a752 100644
--- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PipoHandlers
 Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.pipo;bundle-version="2.0.0",
- org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.pipo;bundle-version="2.1.0",
+ org.adempiere.base;bundle-version="2.1.0"
diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF
index 12f62f2572..c51fefb6a8 100644
--- a/org.adempiere.pipo/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PiPo
 Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.apache.commons.codec;version="1.3.0",
  org.apache.commons.codec.binary;version="1.3.0",
@@ -13,5 +13,5 @@ Import-Package: org.apache.commons.codec;version="1.3.0",
 Export-Package: org.adempiere.pipo.srv,
  org.adempiere.pipo2,
  org.adempiere.pipo2.exception
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0"
 Service-Component: OSGI-INF/dictionaryservice.xml
diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
index 402749e2af..ceb644c236 100644
--- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
+++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Plugin Utils
 Bundle-SymbolicName: org.adempiere.plugin.utils
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.adempiere.base,
  org.adempiere.util,
diff --git a/org.adempiere.replication-feature/feature.xml b/org.adempiere.replication-feature/feature.xml
index bf857bb9f6..55e6a75a58 100644
--- a/org.adempiere.replication-feature/feature.xml
+++ b/org.adempiere.replication-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.replication"
       label="Replication-feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,14 +17,14 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.1.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.replication"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.replication.server-feature/feature.xml b/org.adempiere.replication.server-feature/feature.xml
index 07f41e7312..1a75849b84 100644
--- a/org.adempiere.replication.server-feature/feature.xml
+++ b/org.adempiere.replication.server-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.replication.server"
       label="Replication Server-feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,16 +17,16 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
-      <import feature="org.adempiere.replication" version="2.0.0.qualifier"/>
-      <import plugin="org.adempiere.server" version="2.0.0.qualifier" />
+      <import feature="org.adempiere.base" version="2.1.0.qualifier"/>
+      <import feature="org.adempiere.replication" version="2.1.0.qualifier"/>
+      <import plugin="org.adempiere.server" version="2.1.0.qualifier" />
    </requires>
 
    <plugin
          id="org.adempiere.replication.server"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF
index 57fe6d1942..fb0901f8ad 100644
--- a/org.adempiere.replication.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Server
 Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.server;bundle-version="2.0.0",
- org.adempiere.replication;bundle-version="2.0.0",
- org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.server;bundle-version="2.1.0",
+ org.adempiere.replication;bundle-version="2.1.0",
+ org.adempiere.base;bundle-version="2.1.0"
 Import-Package: javax.jms;version="1.1.0",
  org.apache.activemq
 Service-Component: OSGI-INF/serverfactory.xml
diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF
index d9fd41635e..d8f2b936c4 100644
--- a/org.adempiere.replication/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Replication
 Bundle-SymbolicName: org.adempiere.replication;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0"
 Export-Package: org.adempiere.process.rpl,
  org.adempiere.process.rpl.exp,
  org.adempiere.process.rpl.imp
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index dddd07f627..6d7fb49f7e 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.report.jasper"
       label="JasperReport-feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,20 +17,20 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.1.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.report.jasper"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <plugin
          id="org.adempiere.report.jasper.library"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <plugin
          id="org.apache.batik.bridge"
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 494c8dd78d..9de146e4c7 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JasperReports Dependency
 Bundle-SymbolicName: org.adempiere.report.jasper.library
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar,
  lib/commons-digester-2.1.jar,
  lib/jasperreports-5.1.2.jar,
diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
index a3c23f3e9f..6652f39c8f 100644
--- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JasperReports Swing Client
 Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.ui.swing;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0",
+ org.adempiere.ui.swing;bundle-version="2.1.0"
 Import-Package: net.sf.jasperreports.engine,
  net.sf.jasperreports.engine.export,
  net.sf.jasperreports.view,
diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
index 03670f85f0..f4576a017b 100644
--- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Jasper Report Web App
 Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Bundle-Version: 2.1.0.qualifier
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Web-ContextPath: JasperReportFiles
 Bundle-ClassPath: .
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index eafa69dd5a..928fe8dbca 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JasperReport integration
 Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: JasperReports.jar
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.apache.commons.codec;version="1.3.0",
  org.apache.commons.codec.binary;version="1.3.0",
  org.apache.commons.logging;version="1.1.1",
  org.apache.commons.logging.impl;version="1.1.1"
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.report.jasper.library;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0",
+ org.adempiere.report.jasper.library;bundle-version="2.1.0"
 Service-Component: OSGI-INF/processfactory.xml
 Export-Package: org.adempiere.report.jasper
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.sdk-feature/feature.xml b/org.adempiere.sdk-feature/feature.xml
index a6ee9bd5aa..c81bf7e7fe 100644
--- a/org.adempiere.sdk-feature/feature.xml
+++ b/org.adempiere.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.sdk"
       label="Adempiere SDK"
-      version="2.0.0.qualifier"
+      version="2.1.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.server-feature/build.xml b/org.adempiere.server-feature/build.xml
index 2574c8cc76..483f976781 100644
--- a/org.adempiere.server-feature/build.xml
+++ b/org.adempiere.server-feature/build.xml
@@ -39,8 +39,8 @@
 		</condition>
 		<echo message="Windows=${isWindows}" />
 
-		<copy file="plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/serverTemplate.xml"
-			tofile="plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml" filtering="yes" overwrite="yes"/>
+		<copy file="plugins/org.adempiere.tomcat.config_2.1.0/META-INF/tomcat/serverTemplate.xml"
+			tofile="plugins/org.adempiere.tomcat.config_2.1.0/META-INF/tomcat/server.xml" filtering="yes" overwrite="yes"/>
 
 	</target>
 
@@ -102,4 +102,4 @@
 	<target name="setup" depends="setupInit, setupWin, setupNonWin"
 		description="Setup Adempiere">
 	</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index 3968098fa9..a96e340bc9 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.server"
       label="iDempiere Server-feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -18,16 +18,16 @@
 
    <includes
          id="org.adempiere.replication.server"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          optional="true"/>
 
    <includes
          id="org.adempiere.ui.zk"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <includes
          id="org.adempiere.webstore"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          optional="true"/>
 
    <includes
@@ -36,7 +36,7 @@
 
    <includes
          id="org.idempiere.felix.webconsole"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <includes
          id="org.adempiere.report.jasper"
@@ -136,14 +136,14 @@
          id="org.adempiere.report.jasper.webapp"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.server"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -286,7 +286,7 @@
          id="org.adempiere.install"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <plugin
          id="org.adempiere.eclipse.equinox.http.servlet"
@@ -320,7 +320,7 @@
          id="org.idempiere.webservices"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index d4c6ecc2a8..57508e0703 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="2.0.0" useFeatures="true" includeLaunchers="true">
+<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="2.1.0" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -28,10 +28,10 @@
    </plugins>
 
    <features>
-      <feature id="org.adempiere.base" version="2.0.0.qualifier"/>
-      <feature id="org.adempiere.server" version="2.0.0.qualifier"/>
-      <feature id="org.idempiere.hazelcast.service" version="2.0.0.qualifier"/>
-      <feature id="org.adempiere.pipo" version="2.0.0.qualifier"/>
+      <feature id="org.adempiere.base" version="2.1.0.qualifier"/>
+      <feature id="org.adempiere.server" version="2.1.0.qualifier"/>
+      <feature id="org.idempiere.hazelcast.service" version="2.1.0.qualifier"/>
+      <feature id="org.adempiere.pipo" version="2.1.0.qualifier"/>
    </features>
 
    <configurations>
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
index d6c421f9c5..48fe19f3da 100644
--- a/org.adempiere.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.adempiere.server
 Bundle-SymbolicName: org.adempiere.server;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
+Bundle-Version: 2.1.0.qualifier
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0",
  org.eclipse.equinox.app;bundle-version="1.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Web-ContextPath: /
diff --git a/org.adempiere.site-feature/feature.xml b/org.adempiere.site-feature/feature.xml
index 9898f1b7a5..001a459377 100644
--- a/org.adempiere.site-feature/feature.xml
+++ b/org.adempiere.site-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.site"
       label="Update Site-feature"
-      version="1.0.0.qualifier"
+      version="2.1.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index 841a153869..d224b77eac 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.target.platform"
       label="Adempiere Target Platform"
-      version="2.0.0.qualifier"
+      version="2.1.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
@@ -34,7 +34,7 @@
 
    <includes
          id="org.adempiere.bundles.external"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <includes
          id="org.eclipse.gemini.web.feature"
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
index aa38807b2f..3a630aceca 100644
--- a/org.adempiere.ui.swing-feature/feature.xml
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.ui.swing"
       label="Swing Client-feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,21 +17,21 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.1.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.report.jasper.swing"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.ui.swing"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <plugin
          id="org.restlet.ext.net"
diff --git a/org.adempiere.ui.swing-feature/swingclient.product b/org.adempiere.ui.swing-feature/swingclient.product
index c5d8d909c6..63689ee191 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product
+++ b/org.adempiere.ui.swing-feature/swingclient.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" id="org.adempiere.ui.swing.client_product" application="org.adempiere.ui.swing.client" version="2.0.0" useFeatures="true" includeLaunchers="true">
+<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" id="org.adempiere.ui.swing.client_product" application="org.adempiere.ui.swing.client" version="2.1.0" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -26,10 +26,10 @@
    </plugins>
 
    <features>
-      <feature id="org.adempiere.base" version="2.0.0.qualifier"/>
-      <feature id="org.adempiere.ui.swing" version="2.0.0.qualifier"/>
-      <feature id="org.idempiere.hazelcast.service" version="2.0.0.qualifier"/>
-      <feature id="org.adempiere.pipo" version="2.0.0.qualifier"/>
+      <feature id="org.adempiere.base" version="2.1.0.qualifier"/>
+      <feature id="org.adempiere.ui.swing" version="2.1.0.qualifier"/>
+      <feature id="org.idempiere.hazelcast.service" version="2.1.0.qualifier"/>
+      <feature id="org.adempiere.pipo" version="2.1.0.qualifier"/>
    </features>
 
    <configurations>
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index 2667429f3b..e53e5496aa 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Swing Client
 Bundle-SymbolicName: org.adempiere.ui.swing;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-ClassPath: client.jar,
  swingx-1.6.jar,
  looks-2.0.4.jar,
@@ -68,8 +68,8 @@ Export-Package: com.jgoodies.looks,
  org.jdesktop.swingx.tree,
  org.jdesktop.swingx.treetable,
  org.jdesktop.swingx.util
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.ui;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0",
+ org.adempiere.ui;bundle-version="2.1.0",
  org.restlet;bundle-version="2.1.0",
  org.restlet.ext.net;bundle-version="2.1.0",
  org.restlet.ext.servlet;bundle-version="2.1.0",
diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml
index a4a0b0ed76..28d2b00696 100644
--- a/org.adempiere.ui.zk-feature/feature.xml
+++ b/org.adempiere.ui.zk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.ui.zk"
       label="Zk Client-feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,14 +17,14 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.1.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.ui.zk"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"/>
+         version="2.1.0.qualifier"/>
 
    <plugin
          id="org.zkoss.zk.library"
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index ade80c5f59..7b22d64915 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Zk Web Client
 Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.activation;version="1.1.1",
  javax.servlet,
@@ -83,8 +83,8 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  web.js.jawwa.atmosphere,
  web.js.zkforge,
  web.js.zkforge.mold
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.ui;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0",
+ org.adempiere.ui;bundle-version="2.1.0",
  org.zkoss.zk.library;bundle-version="6.0.0"
 Bundle-Activator: org.adempiere.webui.WebUIActivator
 Eclipse-ExtensibleAPI: true
diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF
index 93ae51af5d..0e743766eb 100644
--- a/org.adempiere.ui/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UI base
 Bundle-SymbolicName: org.adempiere.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0",
  org.apache.xerces;bundle-version="2.9.0",
  org.eclipse.equinox.app;bundle-version="1.3.0"
 Export-Package: org.compiere.apps,
diff --git a/org.adempiere.webstore-feature/feature.xml b/org.adempiere.webstore-feature/feature.xml
index 423e78b050..c53973f89a 100644
--- a/org.adempiere.webstore-feature/feature.xml
+++ b/org.adempiere.webstore-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.webstore"
       label="Webstore-feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,7 +17,7 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.1.0.qualifier"/>
       <import plugin="org.adempiere.report.jasper.webapp" version="2.0.0.qualifer"/>
       <import plugin="javax.servlet.jsp"/>
       <import plugin="javax.servlet.jsp.jstl"/>
@@ -27,14 +27,14 @@
          id="org.adempiere.webstore"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.webstore.resource"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -42,7 +42,7 @@
          id="org.adempiere.webstore.servlet"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
index 6ca476b538..e774e28af0 100644
--- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Webstore Resource
 Bundle-SymbolicName: org.adempiere.webstore.resource
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Adempiere.org
-Fragment-Host: org.adempiere.webstore;bundle-version="2.0.0"
+Fragment-Host: org.adempiere.webstore;bundle-version="2.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.compiere.wstore
diff --git a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
index c2cf4d9431..9a029e17a5 100644
--- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Servlet
 Bundle-SymbolicName: org.adempiere.webstore.servlet;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Vendor: Adempiere.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.compiere.wstore
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0",
  org.eclipse.equinox.http.registry
 Import-Package: javax.servlet,
  javax.servlet.http,
diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF
index 7904cc7792..b66242f14f 100644
--- a/org.adempiere.webstore/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.adempiere.webstore
 Bundle-SymbolicName: org.adempiere.webstore;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.report.jasper.webapp;bundle-version="2.0.0"
+Bundle-Version: 2.1.0.qualifier
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0",
+ org.adempiere.report.jasper.webapp;bundle-version="2.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Web-ContextPath: wstore
 Import-Package: javax.servlet;version="2.5.0",
diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index 232e613ffd..190d7d55b1 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OracleProvider
 Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.install;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0",
+ org.adempiere.install;bundle-version="2.1.0"
 Bundle-ClassPath: .,
  ojdbc6.jar,
  c3p0-0.9.2.jar,
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index 69d2a7518f..61c28c3fa3 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PostgresqlProvider
 Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,
  postgresql-9.2-1004.jdbc4.jar,
  c3p0-0.9.2.jar,
  mchange-commons-java-0.2.3.3.jar
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.install;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0",
+ org.adempiere.install;bundle-version="2.1.0"
 Import-Package: junit.framework;version="3.8.2",
  org.junit;version="4.8.1",
  org.osgi.framework
diff --git a/org.compiere.db.provider-feature/feature.xml b/org.compiere.db.provider-feature/feature.xml
index ed5bc9b406..f4244ec71f 100644
--- a/org.compiere.db.provider-feature/feature.xml
+++ b/org.compiere.db.provider-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.compiere.db.provider"
       label="Database Provider-feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,21 +17,21 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.1.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.compiere.db.oracle.provider"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.compiere.db.postgresql.provider"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml
index 3f2e907d01..1b1ca217c1 100644
--- a/org.idempiere.eclipse.platform-feature/feature.xml
+++ b/org.idempiere.eclipse.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.eclipse.platform"
       label="Eclipse Platform for iDempiere"
-      version="2.0.0.qualifier"
+      version="2.1.0.qualifier"
       provider-name="www.idempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.idempiere.eclipse.platform-feature/update.bat b/org.idempiere.eclipse.platform-feature/update.bat
index d3805cce4c..501fd8e2d5 100644
--- a/org.idempiere.eclipse.platform-feature/update.bat
+++ b/org.idempiere.eclipse.platform-feature/update.bat
@@ -11,6 +11,10 @@ if exist plugins/org.adempiere.tomcat.config_1.0.0/META-INF/tomcat/server.xml (
 )
 if exist plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml (
    copy plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml server.xml.sav
+   del /q plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml
+)
+if exist plugins/org.adempiere.tomcat.config_2.1.0/META-INF/tomcat/server.xml (
+   copy plugins/org.adempiere.tomcat.config_2.1.0/META-INF/tomcat/server.xml server.xml.sav
 )
 
 java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %~dp0 -repository %1 -u org.adempiere.server.product
@@ -19,6 +23,6 @@ java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.ins
 
 cp idempiere.ini.sav idempiere.ini
 if exist server.xml.sav (
-   copy server.xml.sav plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml 
+   copy server.xml.sav plugins/org.adempiere.tomcat.config_2.1.0/META-INF/tomcat/server.xml 
    del /q server.xml.sav
 )
diff --git a/org.idempiere.eclipse.platform-feature/update.sh b/org.idempiere.eclipse.platform-feature/update.sh
index cea34fc074..369176667b 100644
--- a/org.idempiere.eclipse.platform-feature/update.sh
+++ b/org.idempiere.eclipse.platform-feature/update.sh
@@ -18,6 +18,11 @@ fi
 if [ -f plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml ]
 then
    cp plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml server.xml.sav
+   rm plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml
+fi
+if [ -f plugins/org.adempiere.tomcat.config_2.1.0/META-INF/tomcat/server.xml ]
+then
+   cp plugins/org.adempiere.tomcat.config_2.1.0/META-INF/tomcat/server.xml server.xml.sav
 fi
 java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=director -jar plugins/org.eclipse.osgi_3.7.*.jar -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u org.adempiere.server.product
 
@@ -26,7 +31,7 @@ java -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.ins
 cp idempiere.ini.sav idempiere.ini
 if [ -f server.xml.sav ]
 then
-   cp server.xml.sav plugins/org.adempiere.tomcat.config_2.0.0/META-INF/tomcat/server.xml 
+   cp server.xml.sav plugins/org.adempiere.tomcat.config_2.1.0/META-INF/tomcat/server.xml 
    rm -f server.xml.sav
 fi
 
diff --git a/org.idempiere.felix.webconsole-feature/feature.xml b/org.idempiere.felix.webconsole-feature/feature.xml
index 1da425cb74..f38b192756 100644
--- a/org.idempiere.felix.webconsole-feature/feature.xml
+++ b/org.idempiere.felix.webconsole-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.felix.webconsole"
       label="Felix Web Console Feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
index 7fec536b0f..5d47554f2d 100644
--- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
+++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Web Console
 Bundle-SymbolicName: org.idempiere.felix.webconsole
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.idempiere.felix.webconsole.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.idempiere.fitnesse-feature/feature.xml b/org.idempiere.fitnesse-feature/feature.xml
index 5acf324e31..756a60adab 100644
--- a/org.idempiere.fitnesse-feature/feature.xml
+++ b/org.idempiere.fitnesse-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.fitnesse"
       label="Fitnesse Feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -20,28 +20,28 @@
          id="org.idempiere.fitnesse.fixture"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.fitnesse.server"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.ui.zk.selenium"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.fitrecorder"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
index 3099d40d7f..349ad3eb99 100644
--- a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fixture
 Bundle-SymbolicName: org.idempiere.fitnesse.fixture
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.idempiere.fitnesse.fixture.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
index 5794140128..b527165212 100644
--- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fitnesse Server
 Bundle-SymbolicName: org.idempiere.fitnesse.server
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.idempiere.fitnesse.server.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
index 6cf1c5b608..d51ff8bbd3 100644
--- a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fitrecorder
 Bundle-SymbolicName: org.idempiere.fitrecorder;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.adempiere.plugin.utils.AdempiereActivator
 Import-Package: org.adempiere.base,
  org.adempiere.plugin.utils,
@@ -10,4 +10,4 @@ Import-Package: org.adempiere.base,
  org.osgi.framework;version="1.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: plugin.xml
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0"
diff --git a/org.idempiere.hazelcast.service-feature/feature.xml b/org.idempiere.hazelcast.service-feature/feature.xml
index c02f3c994c..380dec496a 100644
--- a/org.idempiere.hazelcast.service-feature/feature.xml
+++ b/org.idempiere.hazelcast.service-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.hazelcast.service"
       label="Hazelcast Service Feature"
-      version="2.0.0.qualifier">
+      version="2.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -20,7 +20,7 @@
          id="org.idempiere.hazelcast.service"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
diff --git a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
index a590584389..005fc34f63 100644
--- a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Hazelcast Service Configuration
 Bundle-SymbolicName: org.idempiere.hazelcast.service.config
 Bundle-Version: 2.0.0
-Fragment-Host: org.idempiere.hazelcast.service;bundle-version="2.0.0"
+Fragment-Host: org.idempiere.hazelcast.service;bundle-version="2.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
index b2a2fa22ae..60de70ad62 100644
--- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Hazelcast Service
 Bundle-SymbolicName: org.idempiere.hazelcast.service
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.idempiere.hazelcast.service.Activator
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.crypto,
diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
index 6530f90c65..bdb01844a8 100644
--- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
+++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Zk Selenium
 Bundle-SymbolicName: org.idempiere.ui.zk.selenium
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 855fb933c6..1b52f9a2e2 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Webservices
 Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.idempiere.webservices.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/ws_modelfactory.xml
@@ -59,8 +59,8 @@ Import-Package: javax.activation;version="1.1.1",
  org.apache.xerces.xs.datatypes;version="2.9.0",
  org.apache.xml.serialize;version="2.9.0",
  org.osgi.framework;version="1.6.0"
-Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
- org.adempiere.ui;bundle-version="2.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="2.1.0",
+ org.adempiere.ui;bundle-version="2.1.0",
  org.apache.ecs;bundle-version="1.0.0"
 Bundle-ClassPath: .,
  WEB-INF/lib/spring-osgi-extender-1.2.1.jar,