TCI - Update version to 1.8.0

Change-Id: I72287488e8cbf418d5885645f3d0849eb7d2fd00
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.model.edit/META-INF/MANIFEST.MF
index d7607f9..87be224 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Client Model Edit
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.model.edit;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.emfstore.internal.client.model.provider.ClientModelEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
@@ -12,11 +12,11 @@
  r;uses:="org.eclipse.emf.ecore,  org.eclipse.emf.emfstore.internal.co
  mmon.model.provider,  org.eclipse.emf.common.util,  org.eclipse.emf.c
  ommon,  org.eclipse.emf.edit.provider,  org.eclipse.emf.common.notify
- ,  org.eclipse.emf.emfstore.internal.client.model.util";version="1.7.
+ ,  org.eclipse.emf.emfstore.internal.client.model.util";version="1.8.
  0"
-Require-Bundle: org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml
index 97fb7e8..3cdd779 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.model.edit</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.transaction/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.transaction/META-INF/MANIFEST.MF
index 7b93f1f..cbe22e6 100644
--- a/bundles/org.eclipse.emf.emfstore.client.transaction/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.transaction/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Transaction
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.transaction;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.7.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.emf.transaction;bundle-version="[1.6.0,2.0.0)";visibility:=reexport
 Export-Package: org.eclipse.emf.emfstore.internal.client.transaction;v
- ersion="1.7.0";x-internal:=true
+ ersion="1.8.0";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml b/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml
index f6413e6..338e224 100644
--- a/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.transaction</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/META-INF/MANIFEST.MF
index f515101..887d83c 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: HistoryBrowserComparator
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui.historybrowsercomparator;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.emf.compare;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.compare;bundle-version="[3.5.300,4.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.client;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.client.ui;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.client.ui;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.emf.compare.ide.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.compare.ide;bundle-version="[3.1.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.compare.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
@@ -16,4 +16,4 @@
  org.eclipse.jface;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.0.0,4.0.0)"
 Export-Package: org.eclipse.emf.emfstore.client.ui.historybrowsercompa
- rator;version="1.7.0";x-internal:=true
+ rator;version="1.8.0";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml
index 5cf8a8d..e256ee6 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui.historybrowsercomparator</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.ui.rap/META-INF/MANIFEST.MF
index c839639..8d81494 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Client UI for RAP
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui.rap
-Bundle-Version: 1.7.0.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="1.7.0"
+Bundle-Version: 1.8.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="1.8.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.emf.emfstore.internal.client.ui.dialogs.lo
- gin;version="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.interna
- l.client.ui.dialogs.merge.ui;version="1.7.0";x-internal:=true,org.ecl
- ipse.emf.emfstore.internal.client.ui.util;version="1.7.0";x-friends:=
+ gin;version="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.interna
+ l.client.ui.dialogs.merge.ui;version="1.8.0";x-internal:=true,org.ecl
+ ipse.emf.emfstore.internal.client.ui.util;version="1.8.0";x-friends:=
  "org.eclipse.emf.emfstore.client.ui"
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rap/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui.rap/pom.xml
index 2f955d7..6a1ea57 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rap/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rap/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui.rap</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/META-INF/MANIFEST.MF
index fdc0aa3..a8f2c88 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Client UI for RCP
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui.rcp
-Bundle-Version: 1.7.0.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="1.7.0"
+Bundle-Version: 1.8.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="1.8.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.emfstore.internal.client.ui.dialogs.lo
- gin;version="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.interna
- l.client.ui.dialogs.merge.ui;version="1.7.0";x-internal:=true,org.ecl
+ gin;version="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.interna
+ l.client.ui.dialogs.merge.ui;version="1.8.0";x-internal:=true,org.ecl
  ipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.components;vers
- ion="1.7.0";x-friends:="org.eclipse.emf.emfstore.client.ui",org.eclip
- se.emf.emfstore.internal.client.ui.util;version="1.7.0";x-friends:="o
+ ion="1.8.0";x-friends:="org.eclipse.emf.emfstore.client.ui",org.eclip
+ se.emf.emfstore.internal.client.ui.util;version="1.8.0";x-friends:="o
  rg.eclipse.emf.emfstore.client.ui"
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/pom.xml
index cb6261c..7a39dcf 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui.rcp</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.transaction/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/META-INF/MANIFEST.MF
index b46346c..9c9d05e 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.transaction/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Transaction UI
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui.transaction;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.emf.transaction;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="[1.7.0,2.0.0)"
+ org.eclipse.emf.emfstore.client;bundle-version="[1.8.0,2.0.0)"
 Export-Package: org.eclipse.emf.emfstore.internal.client.ui.transactio
- n;version="1.7.0";x-internal:=true
+ n;version="1.8.0";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.transaction/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/pom.xml
index 77ec430..b693e09 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.transaction/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui.transaction</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.ui/META-INF/MANIFEST.MF
index c903f5d..abed5b1 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/META-INF/MANIFEST.MF
@@ -2,60 +2,60 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Client UI
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-Activator: org.eclipse.emf.emfstore.internal.client.ui.Activator
 Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.emf.emfstore.server.model
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ClassPath: .,
  lib/dmp.jar
-Export-Package: org.eclipse.emf.emfstore.client.ui;version="1.7.0"; us
+Export-Package: org.eclipse.emf.emfstore.client.ui;version="1.8.0"; us
  es:="org.eclipse.emf.ecore,  org.eclipse.emf.emfstore.client,  org.ec
  lipse.swt.widgets,  org.eclipse.emf.emfstore.server.model.versionspec
- ",org.eclipse.emf.emfstore.internal.client.ui;version="1.7.0";x-inter
+ ",org.eclipse.emf.emfstore.internal.client.ui;version="1.8.0";x-inter
  nal:=true,org.eclipse.emf.emfstore.internal.client.ui.common;version=
- "1.7.0";x-friends:="org.eclipse.emf.emfstore.client.test.ui,org.eclip
+ "1.8.0";x-friends:="org.eclipse.emf.emfstore.client.test.ui,org.eclip
  se.emf.ecp.emfstore.ui",org.eclipse.emf.emfstore.internal.client.ui.c
- ontroller;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.client
+ ontroller;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.client
  .test.ui,org.eclipse.emf.ecp.emfstore.ui",org.eclipse.emf.emfstore.in
- ternal.client.ui.decorators;version="1.7.0";x-internal:=true,org.ecli
- pse.emf.emfstore.internal.client.ui.dialogs;version="1.7.0";x-interna
+ ternal.client.ui.decorators;version="1.8.0";x-internal:=true,org.ecli
+ pse.emf.emfstore.internal.client.ui.dialogs;version="1.8.0";x-interna
  l:=true,org.eclipse.emf.emfstore.internal.client.ui.dialogs.admin;ver
- sion="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.internal.clien
- t.ui.dialogs.admin.acimport;version="1.7.0";x-internal:=true,org.ecli
+ sion="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.internal.clien
+ t.ui.dialogs.admin.acimport;version="1.8.0";x-internal:=true,org.ecli
  pse.emf.emfstore.internal.client.ui.dialogs.admin.acimport.wizard;ver
- sion="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.internal.clien
- t.ui.dialogs.admin.action;version="1.7.0";x-internal:=true,org.eclips
- e.emf.emfstore.internal.client.ui.dialogs.login;version="1.7.0";x-int
+ sion="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.internal.clien
+ t.ui.dialogs.admin.action;version="1.8.0";x-internal:=true,org.eclips
+ e.emf.emfstore.internal.client.ui.dialogs.login;version="1.8.0";x-int
  ernal:=true,org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge
- ;version="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.internal.c
- lient.ui.dialogs.merge.ui;version="1.7.0";x-internal:=true,org.eclips
+ ;version="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.internal.c
+ lient.ui.dialogs.merge.ui;version="1.8.0";x-internal:=true,org.eclips
  e.emf.emfstore.internal.client.ui.dialogs.merge.ui.components;version
- ="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.internal.client.ui
- .dialogs.merge.ui.widgets;version="1.7.0";x-internal:=true,org.eclips
- e.emf.emfstore.internal.client.ui.dialogs.merge.util;version="1.7.0";
+ ="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.internal.client.ui
+ .dialogs.merge.ui.widgets;version="1.8.0";x-internal:=true,org.eclips
+ e.emf.emfstore.internal.client.ui.dialogs.merge.util;version="1.8.0";
  x-internal:=true,org.eclipse.emf.emfstore.internal.client.ui.epackage
- s;version="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.internal.
- client.ui.exceptions;version="1.7.0";x-internal:=true,org.eclipse.emf
- .emfstore.internal.client.ui.handlers;version="1.7.0";x-internal:=tru
+ s;version="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.internal.
+ client.ui.exceptions;version="1.8.0";x-internal:=true,org.eclipse.emf
+ .emfstore.internal.client.ui.handlers;version="1.8.0";x-internal:=tru
  e,org.eclipse.emf.emfstore.internal.client.ui.handlers.exportimport;v
- ersion="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.internal.cli
- ent.ui.testers;version="1.7.0";x-internal:=true,org.eclipse.emf.emfst
- ore.internal.client.ui.util;version="1.7.0";x-internal:=true,org.ecli
- pse.emf.emfstore.internal.client.ui.views.changes;version="1.7.0";x-i
+ ersion="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.internal.cli
+ ent.ui.testers;version="1.8.0";x-internal:=true,org.eclipse.emf.emfst
+ ore.internal.client.ui.util;version="1.8.0";x-internal:=true,org.ecli
+ pse.emf.emfstore.internal.client.ui.views.changes;version="1.8.0";x-i
  nternal:=true,org.eclipse.emf.emfstore.internal.client.ui.views.emfst
- orebrowser.views;version="1.7.0";x-friends:="org.eclipse.emf.ecp.emfs
+ orebrowser.views;version="1.8.0";x-friends:="org.eclipse.emf.ecp.emfs
  tore.ui",org.eclipse.emf.emfstore.internal.client.ui.views.historybro
- wserview;version="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.in
- ternal.client.ui.views.historybrowserview.graph;version="1.7.0";x-int
+ wserview;version="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.in
+ ternal.client.ui.views.historybrowserview.graph;version="1.8.0";x-int
  ernal:=true,org.eclipse.emf.emfstore.internal.client.ui.views.scm;ver
- sion="1.7.0";x-internal:=true,org.eclipse.wb.swt;version="1.7.0";x-in
+ sion="1.8.0";x-internal:=true,org.eclipse.wb.swt;version="1.8.0";x-in
  ternal:=true;uses:="org.eclipse.jface.resource,org.eclipse.swt.graphi
  cs"
 Import-Package: org.eclipse.core.commands;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml
index 611688c..61db7f9 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.client/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client/META-INF/MANIFEST.MF
index 59407e4..73aeb83 100644
--- a/bundles/org.eclipse.emf.emfstore.client/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client/META-INF/MANIFEST.MF
@@ -2,39 +2,39 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Client
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.server;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.migration;bundle-version="[1.7.0,2.0.0)"
+ org.eclipse.emf.emfstore.server;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.migration;bundle-version="[1.8.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.emf.emfstore.internal.client.model.Activator
 Import-Package: org.apache.commons.codec.binary;version="1.3.0"
-Export-Package: org.eclipse.emf.emfstore.client;version="1.7.0",org.ec
- lipse.emf.emfstore.client.callbacks;version="1.7.0",org.eclipse.emf.e
- mfstore.client.changetracking;version="1.7.0",org.eclipse.emf.emfstor
- e.client.exceptions;version="1.7.0",org.eclipse.emf.emfstore.client.h
- andler;version="1.7.0",org.eclipse.emf.emfstore.client.observer;versi
- on="1.7.0",org.eclipse.emf.emfstore.client.provider;version="1.7.0",o
- rg.eclipse.emf.emfstore.client.sessionprovider;version="1.7.0",org.ec
- lipse.emf.emfstore.client.util;version="1.7.0",org.eclipse.emf.emfsto
- re.internal.client.accesscontrol;version="1.7.0";x-friends:="org.ecli
+Export-Package: org.eclipse.emf.emfstore.client;version="1.8.0",org.ec
+ lipse.emf.emfstore.client.callbacks;version="1.8.0",org.eclipse.emf.e
+ mfstore.client.changetracking;version="1.8.0",org.eclipse.emf.emfstor
+ e.client.exceptions;version="1.8.0",org.eclipse.emf.emfstore.client.h
+ andler;version="1.8.0",org.eclipse.emf.emfstore.client.observer;versi
+ on="1.8.0",org.eclipse.emf.emfstore.client.provider;version="1.8.0",o
+ rg.eclipse.emf.emfstore.client.sessionprovider;version="1.8.0",org.ec
+ lipse.emf.emfstore.client.util;version="1.8.0",org.eclipse.emf.emfsto
+ re.internal.client.accesscontrol;version="1.8.0";x-friends:="org.ecli
  pse.emf.emfstore.client.ui,org.eclipse.emf.ecp.emfstore.ui",org.eclip
- se.emf.emfstore.internal.client.common;version="1.7.0";x-friends:="or
+ se.emf.emfstore.internal.client.common;version="1.8.0";x-friends:="or
  g.eclipse.emf.emfstore.client.ui",org.eclipse.emf.emfstore.internal.c
- lient.configuration;version="1.7.0"; x-friends:="org.eclipse.emf.emfs
+ lient.configuration;version="1.8.0"; x-friends:="org.eclipse.emf.emfs
  tore.client.ui,  org.eclipse.emf.emfstore.fuzzy.emf.test,  org.eclips
  e.emf.emfstore.server.test,  org.eclipse.emf.ecp.emfstore.core,  org.
  eclipse.emf.emfstore.client.test,  org.eclipse.emf.emfstore.client.te
  st.ui",org.eclipse.emf.emfstore.internal.client.importexport;version=
- "1.7.0";x-friends:="org.eclipse.emf.emfstore.client.test,org.eclipse.
+ "1.8.0";x-friends:="org.eclipse.emf.emfstore.client.test,org.eclipse.
  emf.emfstore.client.ui,org.eclipse.emf.ecp.emfstore.ui",org.eclipse.e
- mf.emfstore.internal.client.importexport.impl;version="1.7.0";x-frien
+ mf.emfstore.internal.client.importexport.impl;version="1.8.0";x-frien
  ds:="org.eclipse.emf.emfstore.client.test,org.eclipse.emf.ecp.emfstor
- e.ui",org.eclipse.emf.emfstore.internal.client.model;version="1.7.0";
+ e.ui",org.eclipse.emf.emfstore.internal.client.model;version="1.8.0";
   x-friends:="org.eclipse.emf.emfstore.client.model.edit,  org.eclipse
  .emf.emfstore.client.test.ui,  org.eclipse.emf.emfstore.client.transa
  ction,  org.eclipse.emf.emfstore.client.ui,  org.eclipse.emf.emfstore
@@ -45,56 +45,56 @@
  .ui.e3,  org.eclipse.emf.emfstore.performance.test,  org.eclipse.emf.
  emfstore.fuzzy.emf,  org.eclipse.emf.emfstore.client.ui.transaction, 
   org.eclipse.emf.emfstore.client.ui.test",org.eclipse.emf.emfstore.in
- ternal.client.model.changeTracking;version="1.7.0";x-internal:=true,o
+ ternal.client.model.changeTracking;version="1.8.0";x-internal:=true,o
  rg.eclipse.emf.emfstore.internal.client.model.changeTracking.commands
- ;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.client.transact
+ ;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.client.transact
  ion,org.eclipse.emf.emfstore.client.test",org.eclipse.emf.emfstore.in
- ternal.client.model.changeTracking.merging;version="1.7.0"; x-friends
+ ternal.client.model.changeTracking.merging;version="1.8.0"; x-friends
  :="org.eclipse.emf.emfstore.client.test,  org.eclipse.emf.emfstore.cl
  ient.ui,  org.eclipse.emf.emfstore.example.merging,  org.eclipse.emf.
  emfstore.test.common",org.eclipse.emf.emfstore.internal.client.model.
- changeTracking.merging.conflict;version="1.7.0";x-friends:="org.eclip
+ changeTracking.merging.conflict;version="1.8.0";x-friends:="org.eclip
  se.emf.emfstore.client.test,org.eclipse.emf.emfstore.client.ui,org.ec
  lipse.emf.emfstore.test.common",org.eclipse.emf.emfstore.internal.cli
- ent.model.changeTracking.merging.conflict.conflicts;version="1.7.0";x
+ ent.model.changeTracking.merging.conflict.conflicts;version="1.8.0";x
  -friends:="org.eclipse.emf.emfstore.client.test",org.eclipse.emf.emfs
  tore.internal.client.model.changeTracking.merging.conflict.options;ve
- rsion="1.7.0";x-friends:="org.eclipse.emf.emfstore.client.ui",org.ecl
+ rsion="1.8.0";x-friends:="org.eclipse.emf.emfstore.client.ui",org.ecl
  ipse.emf.emfstore.internal.client.model.changeTracking.merging.util;v
- ersion="1.7.0";x-friends:="org.eclipse.emf.emfstore.client.ui",org.ec
+ ersion="1.8.0";x-friends:="org.eclipse.emf.emfstore.client.ui",org.ec
  lipse.emf.emfstore.internal.client.model.changeTracking.notification.
- filter;version="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.inte
- rnal.client.model.changeTracking.notification.recording;version="1.7.
+ filter;version="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.inte
+ rnal.client.model.changeTracking.notification.recording;version="1.8.
  0";x-friends:="org.eclipse.emf.emfstore.test.common",org.eclipse.emf.
- emfstore.internal.client.model.connectionmanager;version="1.7.0"; x-f
+ emfstore.internal.client.model.connectionmanager;version="1.8.0"; x-f
  riends:="org.eclipse.emf.emfstore.client.ui,  org.eclipse.emf.emfstor
  e.example.helloworld,  org.eclipse.emf.emfstore.test.common,  org.ecl
  ipse.emf.emfstore.server.test,  org.eclipse.emf.ecp.emfstore.ui,  org
  .eclipse.emf.emfstore.client.test.ui",org.eclipse.emf.emfstore.intern
- al.client.model.connectionmanager.xmlrpc;version="1.7.0";x-friends:="
+ al.client.model.connectionmanager.xmlrpc;version="1.8.0";x-friends:="
  org.eclipse.emf.emfstore.test.common",org.eclipse.emf.emfstore.intern
- al.client.model.controller;version="1.7.0";x-friends:="org.eclipse.em
+ al.client.model.controller;version="1.8.0";x-friends:="org.eclipse.em
  f.emfstore.client.ui,org.eclipse.emf.emfstore.client.test,org.eclipse
  .emf.emfstore.example.merging",org.eclipse.emf.emfstore.internal.clie
- nt.model.exceptions;version="1.7.0"; x-friends:="org.eclipse.emf.emfs
+ nt.model.exceptions;version="1.8.0"; x-friends:="org.eclipse.emf.emfs
  tore.client.test,  org.eclipse.emf.emfstore.client.ui,  org.eclipse.e
  mf.emfstore.test.common,  org.eclipse.emf.emfstore.client.ui.test",or
  g.eclipse.emf.emfstore.internal.client.model.filetransfer;version="1.
- 7.0";x-friends:="org.eclipse.emf.emfstore.client.test",org.eclipse.em
- f.emfstore.internal.client.model.impl;version="1.7.0"; x-friends:="or
+ 8.0";x-friends:="org.eclipse.emf.emfstore.client.test",org.eclipse.em
+ f.emfstore.internal.client.model.impl;version="1.8.0"; x-friends:="or
  g.eclipse.emf.emfstore.client.test,  org.eclipse.emf.emfstore.client.
  ui,  org.eclipse.emf.emfstore.fuzzy.emf.test,  org.eclipse.emf.emfsto
  re.test.common,  org.eclipse.emf.emfstore.server.test,  org.eclipse.e
  mf.emfstore.client.test.ui,  org.eclipse.emf.ecp.emfstore.core,  org.
  eclipse.emf.ecp.emfstore.ui.e3",org.eclipse.emf.emfstore.internal.cli
- ent.model.impl.api;version="1.7.0"; x-friends:="org.eclipse.emf.emfst
+ ent.model.impl.api;version="1.8.0"; x-friends:="org.eclipse.emf.emfst
  ore.client.ui,  org.eclipse.emf.emfstore.example.merging,  org.eclips
  e.emf.emfstore.fuzzy.emf.test,  org.eclipse.emf.emfstore.server.test,
    org.eclipse.emf.emfstore.test.common,  org.eclipse.emf.emfstore.cli
  ent.test,  org.eclipse.emf.ecp.emfstore.core,  org.eclipse.emf.ecp.em
  fstore.ui,  org.eclipse.emf.ecp.emfstore.ui.e3,  org.eclipse.emf.emfs
  tore.fuzzy.emf,  org.eclipse.emf.emfstore.client.test.ui",org.eclipse
- .emf.emfstore.internal.client.model.util;version="1.7.0"; x-friends:=
+ .emf.emfstore.internal.client.model.util;version="1.8.0"; x-friends:=
  "org.eclipse.emf.emfstore.client.model.edit,  org.eclipse.emf.emfstor
  e.client.transaction,  org.eclipse.emf.emfstore.client.ui,  org.eclip
  se.emf.emfstore.example.merging,  org.eclipse.emf.emfstore.server.tes
@@ -102,10 +102,10 @@
  re.core,  org.eclipse.emf.ecp.emfstore.ui,  org.eclipse.emf.emfstore.
  fuzzy.emf.test,  org.eclipse.emf.emfstore.client.test,  org.eclipse.e
  mf.emfstore.client.test.ui",org.eclipse.emf.emfstore.internal.client.
- observers;version="1.7.0"; x-friends:="org.eclipse.emf.emfstore.clien
+ observers;version="1.8.0"; x-friends:="org.eclipse.emf.emfstore.clien
  t.test,  org.eclipse.emf.emfstore.client.ui,  org.eclipse.emf.ecp.emf
  store.core,  org.eclipse.emf.ecp.emfstore.ui.e3",org.eclipse.emf.emfs
- tore.internal.client.properties;version="1.7.0";x-friends:="org.eclip
+ tore.internal.client.properties;version="1.8.0";x-friends:="org.eclip
  se.emf.emfstore.client.test",org.eclipse.emf.emfstore.internal.client
  .provider;version="1.0.2";x-internal:=true,org.eclipse.emf.emfstore.i
  nternal.client.startup;version="1.0.2";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.client/pom.xml b/bundles/org.eclipse.emf.emfstore.client/pom.xml
index f90a8d6..1d0205b 100644
--- a/bundles/org.eclipse.emf.emfstore.client/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.common.model.edit/META-INF/MANIFEST.MF
index 6a48c92..cd7de8a 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Common Model Edit
 Bundle-SymbolicName: org.eclipse.emf.emfstore.common.model.edit;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.emfstore.internal.common.model.provider.CommonEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.emf.emfstore.internal.common.model.provide
- r;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.server.model.e
+ r;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.server.model.e
  dit,org.eclipse.emf.emfstore.client.model.edit,org.eclipse.emf.emfsto
  re.client.test"
 Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.emfstore.common.model;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml
index d97f14d..bc59fb4 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.common.model.edit</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.common.model/META-INF/MANIFEST.MF
index b647941..ebf655e 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.common.model/META-INF/MANIFEST.MF
@@ -2,67 +2,50 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Common Model
 Bundle-SymbolicName: org.eclipse.emf.emfstore.common.model;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.emfstore.common;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.emf.emfstore.common;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.emfstore.common.model;version="1.7.0",
- org.eclipse.emf.emfstore.common.model.util;version="1.7.0",
- org.eclipse.emf.emfstore.internal.common.model;version="1.7.0";
-  x-friends:="org.eclipse.emf.emfstore.client,
-   org.eclipse.emf.emfstore.client.model.edit,
-   org.eclipse.emf.emfstore.client.ui,
-   org.eclipse.emf.emfstore.common.model.edit,
-   org.eclipse.emf.emfstore.ecore,
-   org.eclipse.emf.emfstore.example.merging,
-   org.eclipse.emf.emfstore.fuzzy.emf.test,
-   org.eclipse.emf.emfstore.server,
-   org.eclipse.emf.emfstore.server.model,
-   org.eclipse.emf.emfstore.server.model.edit,
-   org.eclipse.emf.emfstore.test.common,
-   org.eclipse.emf.emfstore.client.changetracking.test,
-   org.eclipse.emf.emfstore.client.conflictdetection.test,
-   org.eclipse.emf.emfstore.client.recording.test,
-   org.eclipse.emf.emfstore.client.test,
-   org.eclipse.emf.emfstore.server.test,
-   org.eclipse.emf.ecp.emfstore.core,
-   org.eclipse.emf.ecp.emfstore.ui.e3,
-   org.eclipse.emf.emfstore.performance.test,
-   org.eclipse.emf.emfstore.fuzzy.emf,
-   org.eclipse.emf.emfstore.client.ui.test",
- org.eclipse.emf.emfstore.internal.common.model.impl;version="1.7.0";
-  x-friends:="org.eclipse.emf.emfstore.client,
-   org.eclipse.emf.emfstore.client.changetracking.test,
-   org.eclipse.emf.emfstore.client.recording.test,
-   org.eclipse.emf.emfstore.client.ui,
-   org.eclipse.emf.emfstore.server,
-   org.eclipse.emf.emfstore.server.model,
-   org.eclipse.emf.ecp.emfstore.core,
-   org.eclipse.emf.emfstore.client.conflictdetection.test",
- org.eclipse.emf.emfstore.internal.common.model.impl.util;version="1.7.0";x-internal:=true,
- org.eclipse.emf.emfstore.internal.common.model.util;version="1.7.0";
-  x-friends:="org.eclipse.emf.emfstore.client,
-   org.eclipse.emf.emfstore.client.ui,
-   org.eclipse.emf.emfstore.common.model.edit,
-   org.eclipse.emf.emfstore.fuzzy.emf.test,
-   org.eclipse.emf.emfstore.migration,
-   org.eclipse.emf.emfstore.server,
-   org.eclipse.emf.emfstore.server.model,
-   org.eclipse.emf.emfstore.server.model.edit,
-   org.eclipse.emf.emfstore.server.test,
-   org.eclipse.emf.emfstore.test.common,
-   org.eclipse.emf.emfstore.client.changetracking.test,
-   org.eclipse.emf.emfstore.client.recording.test,
-   org.eclipse.emf.emfstore.client.test,
-   org.eclipse.emf.emfstore.client.conflictdetection.test,
-   org.eclipse.emf.ecp.emfstore.core,
-   org.eclipse.emf.emfstore.client.api.test,
-   org.eclipse.emf.emfstore.performance.test,
-   org.eclipse.emf.emfstore.migration.edapt"
+Export-Package: org.eclipse.emf.emfstore.common.model;version="1.8.0",
+ org.eclipse.emf.emfstore.common.model.util;version="1.8.0",org.eclips
+ e.emf.emfstore.internal.common.model;version="1.8.0"; x-friends:="org
+ .eclipse.emf.emfstore.client,  org.eclipse.emf.emfstore.client.model.
+ edit,  org.eclipse.emf.emfstore.client.ui,  org.eclipse.emf.emfstore.
+ common.model.edit,  org.eclipse.emf.emfstore.ecore,  org.eclipse.emf.
+ emfstore.example.merging,  org.eclipse.emf.emfstore.fuzzy.emf.test,  
+ org.eclipse.emf.emfstore.server,  org.eclipse.emf.emfstore.server.mod
+ el,  org.eclipse.emf.emfstore.server.model.edit,  org.eclipse.emf.emf
+ store.test.common,  org.eclipse.emf.emfstore.client.changetracking.te
+ st,  org.eclipse.emf.emfstore.client.conflictdetection.test,  org.ecl
+ ipse.emf.emfstore.client.recording.test,  org.eclipse.emf.emfstore.cl
+ ient.test,  org.eclipse.emf.emfstore.server.test,  org.eclipse.emf.ec
+ p.emfstore.core,  org.eclipse.emf.ecp.emfstore.ui.e3,  org.eclipse.em
+ f.emfstore.performance.test,  org.eclipse.emf.emfstore.fuzzy.emf,  or
+ g.eclipse.emf.emfstore.client.ui.test",org.eclipse.emf.emfstore.inter
+ nal.common.model.impl;version="1.8.0"; x-friends:="org.eclipse.emf.em
+ fstore.client,  org.eclipse.emf.emfstore.client.changetracking.test, 
+  org.eclipse.emf.emfstore.client.recording.test,  org.eclipse.emf.emf
+ store.client.ui,  org.eclipse.emf.emfstore.server,  org.eclipse.emf.e
+ mfstore.server.model,  org.eclipse.emf.ecp.emfstore.core,  org.eclips
+ e.emf.emfstore.client.conflictdetection.test",org.eclipse.emf.emfstor
+ e.internal.common.model.impl.util;version="1.8.0";x-internal:=true,or
+ g.eclipse.emf.emfstore.internal.common.model.util;version="1.8.0"; x-
+ friends:="org.eclipse.emf.emfstore.client,  org.eclipse.emf.emfstore.
+ client.ui,  org.eclipse.emf.emfstore.common.model.edit,  org.eclipse.
+ emf.emfstore.fuzzy.emf.test,  org.eclipse.emf.emfstore.migration,  or
+ g.eclipse.emf.emfstore.server,  org.eclipse.emf.emfstore.server.model
+ ,  org.eclipse.emf.emfstore.server.model.edit,  org.eclipse.emf.emfst
+ ore.server.test,  org.eclipse.emf.emfstore.test.common,  org.eclipse.
+ emf.emfstore.client.changetracking.test,  org.eclipse.emf.emfstore.cl
+ ient.recording.test,  org.eclipse.emf.emfstore.client.test,  org.ecli
+ pse.emf.emfstore.client.conflictdetection.test,  org.eclipse.emf.ecp.
+ emfstore.core,  org.eclipse.emf.emfstore.client.api.test,  org.eclips
+ e.emf.emfstore.performance.test,  org.eclipse.emf.emfstore.migration.
+ edapt"
 
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/pom.xml b/bundles/org.eclipse.emf.emfstore.common.model/pom.xml
index a8b1f3c..bb2b2a8 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.common.model/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.common.model</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.common/META-INF/MANIFEST.MF
index 551bc87..b0df8ca 100644
--- a/bundles/org.eclipse.emf.emfstore.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Common
 Bundle-SymbolicName: org.eclipse.emf.emfstore.common;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-Activator: org.eclipse.emf.emfstore.internal.common.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
@@ -10,13 +10,13 @@
 Bundle-ActivationPolicy: lazy
 Export-Package: com.google.common.base;version="10.0.1",com.google.com
  mon.collect;version="10.0.1",com.google.common.io;version="2.2.0",org
- .apache.commons.io;version="1.7.0",org.apache.commons.io.comparator;v
+ .apache.commons.io;version="1.8.0",org.apache.commons.io.comparator;v
  ersion="2.0.1",org.apache.commons.io.filefilter;version="2.0.1",org.a
  pache.commons.io.input;version="2.0.1",org.apache.commons.io.monitor;
- version="2.0.1",org.apache.commons.io.output;version="1.7.0",org.apac
- he.commons.lang;version="1.7.0",org.eclipse.emf.emfstore.common;versi
- on="1.7.0",org.eclipse.emf.emfstore.common.extensionpoint;version="1.
- 7.0",org.eclipse.emf.emfstore.internal.common;version="1.7.0"; x-frie
+ version="2.0.1",org.apache.commons.io.output;version="1.8.0",org.apac
+ he.commons.lang;version="1.8.0",org.eclipse.emf.emfstore.common;versi
+ on="1.8.0",org.eclipse.emf.emfstore.common.extensionpoint;version="1.
+ 8.0",org.eclipse.emf.emfstore.internal.common;version="1.8.0"; x-frie
  nds:="org.eclipse.emf.emfstore.client,  org.eclipse.emf.emfstore.clie
  nt.test.ui,  org.eclipse.emf.emfstore.client.ui,  org.eclipse.emf.emf
  store.common.model,  org.eclipse.emf.emfstore.example.merging,  org.e
@@ -25,7 +25,7 @@
  ient.test.common,  org.eclipse.emf.emfstore.test.common,  org.eclipse
  .emf.emfstore.client.recording.test,  org.eclipse.emf.emfstore.server
  .test,  org.eclipse.emf.emfstore.client.test",org.eclipse.emf.emfstor
- e.internal.common.api;version="1.7.0"; x-friends:="org.eclipse.emf.em
+ e.internal.common.api;version="1.8.0"; x-friends:="org.eclipse.emf.em
  fstore.client,  org.eclipse.emf.emfstore.client.ui,  org.eclipse.emf.
  emfstore.common.model,  org.eclipse.emf.emfstore.ecore,  org.eclipse.
  emf.emfstore.example.merging,  org.eclipse.emf.emfstore.fuzzy.emf.tes
@@ -37,7 +37,7 @@
  ecp.emfstore.ui.e3,  org.eclipse.emf.emfstore.client.api.test,  org.e
  clipse.emf.emfstore.fuzzy.emf,  org.eclipse.emf.emfstore.client.test,
    org.eclipse.emf.emfstore.client.test.ui",org.eclipse.emf.emfstore.i
- nternal.common.observer;version="1.7.0"; x-friends:="org.eclipse.emf.
+ nternal.common.observer;version="1.8.0"; x-friends:="org.eclipse.emf.
  emfstore.client,  org.eclipse.emf.emfstore.client.test.ui,  org.eclip
  se.emf.emfstore.client.ui,  org.eclipse.emf.emfstore.client.recording
  .test,  org.eclipse.emf.emfstore.client.test"
diff --git a/bundles/org.eclipse.emf.emfstore.common/pom.xml b/bundles/org.eclipse.emf.emfstore.common/pom.xml
index 573264b..c5229b0 100644
--- a/bundles/org.eclipse.emf.emfstore.common/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.common/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.common</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.ecore/META-INF/MANIFEST.MF
index b4c771e..20bb0d8 100644
--- a/bundles/org.eclipse.emf.emfstore.ecore/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.ecore/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore ECore Integration
 Bundle-SymbolicName: org.eclipse.emf.emfstore.ecore;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.emfstore.internal.ecore.Activator
-Require-Bundle: org.eclipse.emf.emfstore.common.model;bundle-version="[1.7.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.emfstore.internal.ecore;version="1.7.0
+Export-Package: org.eclipse.emf.emfstore.internal.ecore;version="1.8.0
  ";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/pom.xml b/bundles/org.eclipse.emf.emfstore.ecore/pom.xml
index 3c53a99..60a59dc 100644
--- a/bundles/org.eclipse.emf.emfstore.ecore/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.ecore/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.ecore</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
index f9400f0..6f5f1b7 100644
--- a/bundles/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Example Hello World
 Bundle-SymbolicName: org.eclipse.emf.emfstore.example.helloworld;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.5.0,2.0.0)",
@@ -10,4 +10,4 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.emfstore.example.helloworld;version="1
- .7.0"
+ .8.0"
diff --git a/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml b/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml
index e33c9a9..ea282c7 100644
--- a/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.example.helloworld</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.installer/META-INF/MANIFEST.MF
index 12e5ae6..41d9c6f 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore example installer
 Bundle-SymbolicName: org.eclipse.emf.emfstore.example.installer;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
index 65c85b7..3db0db4 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Example Hello World
 Bundle-SymbolicName: org.eclipse.emf.emfstore.example.helloworld;singleton:=true
-Bundle-Version: 1.7.0.qualifier
-Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.7.0,2.0.0)",
+Bundle-Version: 1.8.0.qualifier
+Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.emfstore.example.helloworld;version="1.7.0";uses:="org.eclipse.emf.emfstore.client,org.eclipse.equinox.app"
+Export-Package: org.eclipse.emf.emfstore.example.helloworld;version="1.8.0";uses:="org.eclipse.emf.emfstore.client,org.eclipse.equinox.app"
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/pom.xml b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/pom.xml
index e33c9a9..ea282c7 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.example.helloworld</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
index e759c98..2e0a807 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Example Merging client
 Bundle-SymbolicName: org.eclipse.emf.emfstore.example.merging;singleton:=true
-Bundle-Version: 1.7.0.qualifier
-Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.7.0,2.0.0)",
+Bundle-Version: 1.8.0.qualifier
+Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.emfstore.example.helloworld;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.server;bundle-version="[1.7.0,2.0.0)"
+ org.eclipse.emf.emfstore.example.helloworld;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.server;bundle-version="[1.8.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.emfstore.example.merging;version="1.7.0";uses:="org.eclipse.emf.emfstore.client,org.eclipse.equinox.app"
+Export-Package: org.eclipse.emf.emfstore.example.merging;version="1.8.0";uses:="org.eclipse.emf.emfstore.client,org.eclipse.equinox.app"
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml b/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml
index d7dc4e8..1909edd 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.example.installer</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
index 261e2c8..00c02c2 100644
--- a/bundles/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Example Merging client
 Bundle-SymbolicName: org.eclipse.emf.emfstore.example.merging;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.7.0,2.0.0)",
@@ -11,5 +11,5 @@
  org.eclipse.emf.emfstore.server;bundle-version="[1.7.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.emfstore.example.merging;version="1.7.
+Export-Package: org.eclipse.emf.emfstore.example.merging;version="1.8.
  0"
diff --git a/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml b/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml
index e49316a..a7c4893 100644
--- a/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.example.merging</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/META-INF/MANIFEST.MF
index 8bba587..e6d181f 100644
--- a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Example SessionProvider
 Bundle-SymbolicName: org.eclipse.emf.emfstore.example.sessionprovider;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-Activator: org.eclipse.emf.emfstore.exampleclient.Activator
-Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.7.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.emfstore.exampleclient;version="1.7.0";x-internal:=true
+Export-Package: org.eclipse.emf.emfstore.exampleclient;version="1.8.0";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml
index 83d5c65..c1b20bd 100644
--- a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.example.sessionprovider</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/META-INF/MANIFEST.MF
index 2b2e5f2..a9982c9 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Bowling Example Model Edit
 Bundle-SymbolicName: org.eclipse.emf.emfstore.examplemodel.edit;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.emfstore.bowling.provider.BowlingEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.emfstore.bowling.provider;version="1.7
+Export-Package: org.eclipse.emf.emfstore.bowling.provider;version="1.8
  .0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml
index 8ecd8a7..ac182e1 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.examplemodel.edit</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.examplemodel/META-INF/MANIFEST.MF
index ce24177..f6b972e 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.emfstore.examplemodel;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.emfstore.bowling;version="1.7.0",org.e
- clipse.emf.emfstore.bowling.impl;version="1.7.0",org.eclipse.emf.emfs
- tore.bowling.util;version="1.7.0"
+Export-Package: org.eclipse.emf.emfstore.bowling;version="1.8.0",org.e
+ clipse.emf.emfstore.bowling.impl;version="1.8.0",org.eclipse.emf.emfs
+ tore.bowling.util;version="1.8.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml b/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml
index 92dd397..e57ddc4 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.examplemodel</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml
index 494dcfe..76d2346 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml
index a292ee6..50c2c8f 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml
index aa61b50..b48bcc9 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml
index 03d1ed2..7d68ecb 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/bundles/org.eclipse.emf.emfstore.migration.edapt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.migration.edapt/META-INF/MANIFEST.MF
index 6ced5ed..57f6aa5 100644
--- a/bundles/org.eclipse.emf.emfstore.migration.edapt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.migration.edapt/META-INF/MANIFEST.MF
@@ -2,13 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Edapt Migration
 Bundle-SymbolicName: org.eclipse.emf.emfstore.migration.edapt;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.emfstore.migration;bundle-version="[1.7.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.migration;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.common;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.edapt.migration;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf.edapt.history;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.emfstore.common.model;bundle-version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.emf.emfstore.internal.migration.edapt;version="1.7.0";x-internal:=true
+ org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.0,2.0.0)"
+Export-Package: org.eclipse.emf.emfstore.internal.migration.edapt;vers
+ ion="1.8.0";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.migration.edapt/pom.xml b/bundles/org.eclipse.emf.emfstore.migration.edapt/pom.xml
index babcb81..f07f140 100644
--- a/bundles/org.eclipse.emf.emfstore.migration.edapt/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.migration.edapt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.migration.edapt</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.migration/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.migration/META-INF/MANIFEST.MF
index ccb3fa9..af8a034 100644
--- a/bundles/org.eclipse.emf.emfstore.migration/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.migration/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Migration
 Bundle-SymbolicName: org.eclipse.emf.emfstore.migration;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.emfstore.common.model;bundle-version="[1.7.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.emfstore.internal.migration;version="1.7.0";
-  x-friends:="org.eclipse.emf.emfstore.client,
-   org.eclipse.emf.emfstore.server,
-   org.eclipse.emf.emfstore.migration.edapt";uses:="org.eclipse.core.runtime"
+Export-Package: org.eclipse.emf.emfstore.internal.migration;version="1
+ .8.0"; x-friends:="org.eclipse.emf.emfstore.client,  org.eclipse.emf.
+ emfstore.server,  org.eclipse.emf.emfstore.migration.edapt";uses:="or
+ g.eclipse.core.runtime"
diff --git a/bundles/org.eclipse.emf.emfstore.migration/pom.xml b/bundles/org.eclipse.emf.emfstore.migration/pom.xml
index cbc5e9c..371ee6b 100644
--- a/bundles/org.eclipse.emf.emfstore.migration/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.migration/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.migration</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml b/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml
index 8c2b84d..4ced22e 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.client/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.mongodb.client/META-INF/MANIFEST.MF
index 247074b..51a17dd 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.client/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.client/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore mongoDB Client
 Bundle-SymbolicName: org.eclipse.emf.emfstore.mongodb.client;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.7.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.8.0,2.0.0)",
  org.eclipselabs.mongo;bundle-version="[0.7.1,1.0.0)",
  org.eclipselabs.mongo.emf.ext;bundle-version="[0.7.1,1.0.0)",
- org.eclipse.emf.emfstore.mongodb;bundle-version="[1.7.0,2.0.0)"
+ org.eclipse.emf.emfstore.mongodb;bundle-version="[1.8.0,2.0.0)"
 Import-Package: org.osgi.service.cm;version="0.0.0"
 Service-Component: OSGI-INF/config.xml,
  OSGI-INF/provider.xml
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.emfstore.mongodb.client;version="1.7.0
+Export-Package: org.eclipse.emf.emfstore.mongodb.client;version="1.8.0
  ";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml b/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml
index 283830e..72cb164 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.mongodb.client</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.server/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.mongodb.server/META-INF/MANIFEST.MF
index d432835..610f2eb 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.server/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.server/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore mongoDB Server
 Bundle-SymbolicName: org.eclipse.emf.emfstore.mongodb.server;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipselabs.mongo;bundle-version="[0.7.1,1.0.0)",
  org.eclipselabs.mongo.emf.ext;bundle-version="[0.7.1,1.0.0)",
- org.eclipse.emf.emfstore.mongodb;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.server;bundle-version="[1.7.0,2.0.0)"
+ org.eclipse.emf.emfstore.mongodb;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.server;bundle-version="[1.8.0,2.0.0)"
 Import-Package: org.osgi.service.cm;version="0.0.0"
 Service-Component: OSGI-INF/config.xml,
  OSGI-INF/provider.xml
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.emfstore.mongodb.server;version="1.7.0
+Export-Package: org.eclipse.emf.emfstore.mongodb.server;version="1.8.0
  ";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml b/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml
index ce3879f..bcefd01 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.mongodb.server</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.mongodb/META-INF/MANIFEST.MF
index ecda6b4..ce188a1 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.mongodb/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore mongoDB
 Bundle-SymbolicName: org.eclipse.emf.emfstore.mongodb;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipselabs.mongo;bundle-version="[0.7.1,1.0.0)",
  org.eclipselabs.mongo.emf.ext;bundle-version="[0.7.1,1.0.0)",
- org.eclipse.emf.emfstore.common;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.common.model;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.server;bundle-version="[1.7.0,2.0.0)"
+ org.eclipse.emf.emfstore.common;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.server;bundle-version="[1.8.0,2.0.0)"
 Import-Package: org.osgi.service.cm;version="0.0.0"
 Service-Component: OSGI-INF/config.xml,
  OSGI-INF/provider.xml
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.emfstore.mongodb;version="1.7.0";x-fri
+Export-Package: org.eclipse.emf.emfstore.mongodb;version="1.8.0";x-fri
  ends:="org.eclipse.emf.emfstore.mongodb.client,org.eclipse.emf.emfsto
  re.mongodb.server"
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml b/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml
index 13deb2a..6142428 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.mongodb</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.server.model.edit/META-INF/MANIFEST.MF
index 416185c..0ea6062 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Model Edit
 Bundle-SymbolicName: org.eclipse.emf.emfstore.server.model.edit;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.emfstore.internal.server.model.provider.ServerEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.emf.emfstore.internal.server.model.accessc
- ontrol.provider;version="1.7.0";x-internal:=true,org.eclipse.emf.emfs
- tore.internal.server.model.accesscontrol.roles.provider;version="1.7.
+ ontrol.provider;version="1.8.0";x-internal:=true,org.eclipse.emf.emfs
+ tore.internal.server.model.accesscontrol.roles.provider;version="1.8.
  0";x-internal:=true,org.eclipse.emf.emfstore.internal.server.model.pr
- ovider;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.client.mo
+ ovider;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.client.mo
  del.edit,org.eclipse.emf.emfstore.client.test",org.eclipse.emf.emfsto
- re.internal.server.model.url.provider;version="1.7.0";x-internal:=tru
+ re.internal.server.model.url.provider;version="1.8.0";x-internal:=tru
  e,org.eclipse.emf.emfstore.internal.server.model.versioning.events.pr
- ovider;version="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.inte
- rnal.server.model.versioning.events.server.provider;version="1.7.0";x
+ ovider;version="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.inte
+ rnal.server.model.versioning.events.server.provider;version="1.8.0";x
  -internal:=true,org.eclipse.emf.emfstore.internal.server.model.versio
- ning.operations.provider;version="1.7.0";x-friends:="org.eclipse.emf.
+ ning.operations.provider;version="1.8.0";x-friends:="org.eclipse.emf.
  emfstore.client.ui",org.eclipse.emf.emfstore.internal.server.model.ve
- rsioning.operations.semantic.provider;version="1.7.0";x-internal:=tru
+ rsioning.operations.semantic.provider;version="1.8.0";x-internal:=tru
  e,org.eclipse.emf.emfstore.internal.server.model.versioning.provider;
- version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.emfstore.server.model;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.7.0,2.0.0)",
+ version="1.8.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.emfstore.server.model;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml
index 8aa1f60..bc94855 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.server.model.edit</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.server.model/META-INF/MANIFEST.MF
index 66ac3b6..fe1740b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.server.model/META-INF/MANIFEST.MF
@@ -2,62 +2,62 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Server Model
 Bundle-SymbolicName: org.eclipse.emf.emfstore.server.model;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.emf.emfstore.internal.server.model;version
- ="1.7.0"; x-friends:="org.eclipse.emf.emfstore.client,  org.eclipse.e
+ ="1.8.0"; x-friends:="org.eclipse.emf.emfstore.client,  org.eclipse.e
  mf.emfstore.client.model.edit,  org.eclipse.emf.emfstore.client.test.
  common,  org.eclipse.emf.emfstore.client.ui,  org.eclipse.emf.emfstor
  e.server,  org.eclipse.emf.emfstore.server.model.edit,  org.eclipse.e
  mf.emfstore.test.common,  org.eclipse.emf.emfstore.server.test",org.e
- clipse.emf.emfstore.internal.server.model.accesscontrol;version="1.7.
+ clipse.emf.emfstore.internal.server.model.accesscontrol;version="1.8.
  0"; x-friends:="org.eclipse.emf.emfstore.client,  org.eclipse.emf.emf
  store.client.model.edit,  org.eclipse.emf.emfstore.client.ui,  org.ec
  lipse.emf.emfstore.server,  org.eclipse.emf.emfstore.server.model.edi
  t,  org.eclipse.emf.emfstore.server.test,  org.eclipse.emf.emfstore.c
  lient.test.common,  org.eclipse.emf.emfstore.test.common",org.eclipse
- .emf.emfstore.internal.server.model.accesscontrol.impl;version="1.7.0
+ .emf.emfstore.internal.server.model.accesscontrol.impl;version="1.8.0
  ";x-friends:="org.eclipse.emf.emfstore.server",org.eclipse.emf.emfsto
- re.internal.server.model.accesscontrol.roles;version="1.7.0"; x-frien
+ re.internal.server.model.accesscontrol.roles;version="1.8.0"; x-frien
  ds:="org.eclipse.emf.emfstore.client,  org.eclipse.emf.emfstore.clien
  t.ui,  org.eclipse.emf.emfstore.server,  org.eclipse.emf.emfstore.ser
  ver.model.edit,  org.eclipse.emf.emfstore.server.test,  org.eclipse.e
  mf.emfstore.test.common",org.eclipse.emf.emfstore.internal.server.mod
- el.accesscontrol.roles.impl;version="1.7.0";x-friends:="org.eclipse.e
+ el.accesscontrol.roles.impl;version="1.8.0";x-friends:="org.eclipse.e
  mf.emfstore.server",org.eclipse.emf.emfstore.internal.server.model.ac
- cesscontrol.roles.util;version="1.7.0";x-friends:="org.eclipse.emf.em
+ cesscontrol.roles.util;version="1.8.0";x-friends:="org.eclipse.emf.em
  fstore.server,org.eclipse.emf.emfstore.server.model.edit",org.eclipse
- .emf.emfstore.internal.server.model.accesscontrol.util;version="1.7.0
+ .emf.emfstore.internal.server.model.accesscontrol.util;version="1.8.0
  ";x-friends:="org.eclipse.emf.emfstore.server,org.eclipse.emf.emfstor
  e.server.model.edit",org.eclipse.emf.emfstore.internal.server.model.d
- ao;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.server,org.ec
+ ao;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.server,org.ec
  lipse.emf.emfstore.test.common",org.eclipse.emf.emfstore.internal.ser
- ver.model.impl;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.s
+ ver.model.impl;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.s
  erver,org.eclipse.emf.emfstore.client,org.eclipse.emf.emfstore.test.c
  ommon",org.eclipse.emf.emfstore.internal.server.model.impl.api;versio
- n="1.7.0"; x-friends:="org.eclipse.emf.emfstore.client,  org.eclipse.
+ n="1.8.0"; x-friends:="org.eclipse.emf.emfstore.client,  org.eclipse.
  emf.emfstore.client.ui,  org.eclipse.emf.emfstore.test.common,  org.e
  clipse.emf.emfstore.server.test,  org.eclipse.emf.emfstore.server",or
  g.eclipse.emf.emfstore.internal.server.model.impl.api.query;version="
- 1.7.0";x-friends:="org.eclipse.emf.emfstore.client.ui,org.eclipse.emf
+ 1.8.0";x-friends:="org.eclipse.emf.emfstore.client.ui,org.eclipse.emf
  .emfstore.client,org.eclipse.emf.emfstore.client.test",org.eclipse.em
- f.emfstore.internal.server.model.impl.api.versionspec;version="1.7.0"
+ f.emfstore.internal.server.model.impl.api.versionspec;version="1.8.0"
  ; x-friends:="org.eclipse.emf.emfstore.client,  org.eclipse.emf.emfst
  ore.client.ui,  org.eclipse.emf.emfstore.server.test,  org.eclipse.em
  f.emfstore.test.common,  org.eclipse.emf.emfstore.client.api.test",or
- g.eclipse.emf.emfstore.internal.server.model.url;version="1.7.0";x-fr
+ g.eclipse.emf.emfstore.internal.server.model.url;version="1.8.0";x-fr
  iends:="org.eclipse.emf.emfstore.server,org.eclipse.emf.emfstore.clie
  nt,org.eclipse.emf.emfstore.server.model.edit",org.eclipse.emf.emfsto
- re.internal.server.model.url.impl;version="1.7.0";x-friends:="org.ecl
+ re.internal.server.model.url.impl;version="1.8.0";x-friends:="org.ecl
  ipse.emf.emfstore.server",org.eclipse.emf.emfstore.internal.server.mo
- del.url.util;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.ser
+ del.url.util;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.ser
  ver,org.eclipse.emf.emfstore.server.model.edit",org.eclipse.emf.emfst
- ore.internal.server.model.util;version="1.7.0";x-friends:="org.eclips
+ ore.internal.server.model.util;version="1.8.0";x-friends:="org.eclips
  e.emf.emfstore.server,org.eclipse.emf.emfstore.server.model.edit",org
- .eclipse.emf.emfstore.internal.server.model.versioning;version="1.7.0
+ .eclipse.emf.emfstore.internal.server.model.versioning;version="1.8.0
  "; x-friends:="org.eclipse.emf.emfstore.client,  org.eclipse.emf.emfs
  tore.client.model.edit,  org.eclipse.emf.emfstore.client.ui,  org.ecl
  ipse.emf.emfstore.example.merging,  org.eclipse.emf.emfstore.fuzzy.em
@@ -67,25 +67,25 @@
  .test,  org.eclipse.emf.emfstore.client.conflictdetection.test,  org.
  eclipse.emf.emfstore.client.changetracking.test,  org.eclipse.emf.emf
  store.client.test",org.eclipse.emf.emfstore.internal.server.model.ver
- sioning.events;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.s
+ sioning.events;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.s
  erver,org.eclipse.emf.emfstore.server.model.edit",org.eclipse.emf.emf
- store.internal.server.model.versioning.events.impl;version="1.7.0";x-
+ store.internal.server.model.versioning.events.impl;version="1.8.0";x-
  friends:="org.eclipse.emf.emfstore.server",org.eclipse.emf.emfstore.i
- nternal.server.model.versioning.events.server;version="1.7.0";x-frien
+ nternal.server.model.versioning.events.server;version="1.8.0";x-frien
  ds:="org.eclipse.emf.emfstore.server,org.eclipse.emf.emfstore.server.
  model.edit",org.eclipse.emf.emfstore.internal.server.model.versioning
- .events.server.impl;version="1.7.0";x-friends:="org.eclipse.emf.emfst
+ .events.server.impl;version="1.8.0";x-friends:="org.eclipse.emf.emfst
  ore.server",org.eclipse.emf.emfstore.internal.server.model.versioning
- .events.server.util;version="1.7.0";x-friends:="org.eclipse.emf.emfst
+ .events.server.util;version="1.8.0";x-friends:="org.eclipse.emf.emfst
  ore.server,org.eclipse.emf.emfstore.server.model.edit",org.eclipse.em
- f.emfstore.internal.server.model.versioning.events.util;version="1.7.
+ f.emfstore.internal.server.model.versioning.events.util;version="1.8.
  0";x-friends:="org.eclipse.emf.emfstore.server,org.eclipse.emf.emfsto
  re.server.model.edit",org.eclipse.emf.emfstore.internal.server.model.
- versioning.impl;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.
+ versioning.impl;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.
  server,org.eclipse.emf.emfstore.client",org.eclipse.emf.emfstore.inte
- rnal.server.model.versioning.impl.persistent;version="1.7.0";x-friend
+ rnal.server.model.versioning.impl.persistent;version="1.8.0";x-friend
  s:="org.eclipse.emf.emfstore.client",org.eclipse.emf.emfstore.interna
- l.server.model.versioning.operations;version="1.7.0"; x-friends:="org
+ l.server.model.versioning.operations;version="1.8.0"; x-friends:="org
  .eclipse.emf.emfstore.client,  org.eclipse.emf.emfstore.client.change
  tracking.test,  org.eclipse.emf.emfstore.client.conflictdetection.tes
  t,  org.eclipse.emf.emfstore.client.model.edit,  org.eclipse.emf.emfs
@@ -96,34 +96,34 @@
  mf.ecp.emfstore.ui.e3,  org.eclipse.emf.emfstore.server.test,  org.ec
  lipse.emf.emfstore.fuzzy.emf.test,  org.eclipse.emf.emfstore.client.t
  est,  org.eclipse.emf.emfstore.client.ui.test",org.eclipse.emf.emfsto
- re.internal.server.model.versioning.operations.impl;version="1.7.0";x
+ re.internal.server.model.versioning.operations.impl;version="1.8.0";x
  -friends:="org.eclipse.emf.emfstore.client,org.eclipse.emf.emfstore.s
  erver,org.eclipse.emf.emfstore.client.recording.test",org.eclipse.emf
  .emfstore.internal.server.model.versioning.operations.semantic;versio
- n="1.7.0";x-friends:="org.eclipse.emf.emfstore.server,org.eclipse.emf
+ n="1.8.0";x-friends:="org.eclipse.emf.emfstore.server,org.eclipse.emf
  .emfstore.client,org.eclipse.emf.emfstore.server.model.edit",org.ecli
  pse.emf.emfstore.internal.server.model.versioning.operations.semantic
- .impl;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.server",or
+ .impl;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.server",or
  g.eclipse.emf.emfstore.internal.server.model.versioning.operations.se
- mantic.util;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.serv
+ mantic.util;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.serv
  er,org.eclipse.emf.emfstore.server.model.edit",org.eclipse.emf.emfsto
- re.internal.server.model.versioning.operations.util;version="1.7.0"; 
+ re.internal.server.model.versioning.operations.util;version="1.8.0"; 
  x-friends:="org.eclipse.emf.emfstore.client,  org.eclipse.emf.emfstor
  e.client.ui,  org.eclipse.emf.emfstore.server,  org.eclipse.emf.emfst
  ore.server.model.edit,  org.eclipse.emf.emfstore.client.test.common, 
   org.eclipse.emf.emfstore.client.recording.test,  org.eclipse.emf.emf
  store.test.common,  org.eclipse.emf.emfstore.client.changetracking.te
  st,  org.eclipse.emf.emfstore.client.test",org.eclipse.emf.emfstore.i
- nternal.server.model.versioning.util;version="1.7.0"; x-friends:="org
+ nternal.server.model.versioning.util;version="1.8.0"; x-friends:="org
  .eclipse.emf.emfstore.server,  org.eclipse.emf.emfstore.client.test, 
   org.eclipse.emf.emfstore.server.model.edit,  org.eclipse.emf.emfstor
- e.client.ui",org.eclipse.emf.emfstore.server;version="1.7.0",org.ecli
- pse.emf.emfstore.server.model;version="1.7.0",org.eclipse.emf.emfstor
- e.server.model.query;version="1.7.0",org.eclipse.emf.emfstore.server.
- model.versionspec;version="1.7.0"
-Require-Bundle: org.eclipse.emf.emfstore.common.model;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ e.client.ui",org.eclipse.emf.emfstore.server;version="1.8.0",org.ecli
+ pse.emf.emfstore.server.model;version="1.8.0",org.eclipse.emf.emfstor
+ e.server.model.query;version="1.8.0",org.eclipse.emf.emfstore.server.
+ model.versionspec;version="1.8.0"
+Require-Bundle: org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.emfstore.common;bundle-version="[1.7.0,2.0.0)"
+ org.eclipse.emf.emfstore.common;bundle-version="[1.8.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/pom.xml b/bundles/org.eclipse.emf.emfstore.server.model/pom.xml
index adafc3a..7003c0b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.server.model/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.server.model</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.emfstore.server/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.server/META-INF/MANIFEST.MF
index a5ba403..a2b2789 100644
--- a/bundles/org.eclipse.emf.emfstore.server/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.server/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Server
 Bundle-SymbolicName: org.eclipse.emf.emfstore.server;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-Activator: org.eclipse.emf.emfstore.internal.server.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.apache.commons.codec;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.emfstore.server.model;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.migration;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.common;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.common.model;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.server.model;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.migration;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.common;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.emfstore.common.model;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -27,51 +27,51 @@
  .parser;version="3.1.3",org.apache.xmlrpc.serializer;version="3.1.3",
  org.apache.xmlrpc.server;version="3.1.3",org.apache.xmlrpc.util;versi
  on="3.1.3",org.apache.xmlrpc.webserver;version="3.1.3",org.eclipse.em
- f.emfstore.internal.server;version="1.7.0"; x-friends:="org.eclipse.e
+ f.emfstore.internal.server;version="1.8.0"; x-friends:="org.eclipse.e
  mf.emfstore.client,  org.eclipse.emf.emfstore.client.ui,  org.eclipse
  .emf.emfstore.client.test.common,  org.eclipse.emf.emfstore.server.te
  st,  org.eclipse.emf.emfstore.test.common,  org.eclipse.emf.ecp.emfst
  ore.localserver,  org.eclipse.emf.ecp.emfstore.ui,  org.eclipse.emf.e
  mfstore.client.test",org.eclipse.emf.emfstore.internal.server.accessc
- ontrol;version="1.7.0";x-friends:="org.eclipse.emf.emfstore.test.comm
+ ontrol;version="1.8.0";x-friends:="org.eclipse.emf.emfstore.test.comm
  on,org.eclipse.emf.emfstore.server.test",org.eclipse.emf.emfstore.int
- ernal.server.accesscontrol.authentication;version="1.7.0";x-friends:=
+ ernal.server.accesscontrol.authentication;version="1.8.0";x-friends:=
  "org.eclipse.emf.emfstore.client.test,org.eclipse.emf.emfstore.test.c
  ommon",org.eclipse.emf.emfstore.internal.server.accesscontrol.authent
- ication.verifiers;version="1.7.0";x-friends:="org.eclipse.emf.emfstor
+ ication.verifiers;version="1.8.0";x-friends:="org.eclipse.emf.emfstor
  e.client.test,org.eclipse.emf.emfstore.server.test",org.eclipse.emf.e
- mfstore.internal.server.conflictDetection;version="1.7.0"; x-friends:
+ mfstore.internal.server.conflictDetection;version="1.8.0"; x-friends:
  ="org.eclipse.emf.emfstore.client,  org.eclipse.emf.emfstore.client.t
  est,  org.eclipse.emf.emfstore.client.ui,  org.eclipse.emf.emfstore.c
  lient.conflictdetection.test,  org.eclipse.emf.emfstore.test.common",
- org.eclipse.emf.emfstore.internal.server.connection;version="1.7.0";x
+ org.eclipse.emf.emfstore.internal.server.connection;version="1.8.0";x
  -friends:="org.eclipse.emf.emfstore.server.test",org.eclipse.emf.emfs
- tore.internal.server.connection.xmlrpc;version="1.7.0";x-friends:="or
+ tore.internal.server.connection.xmlrpc;version="1.8.0";x-friends:="or
  g.eclipse.emf.emfstore.client,org.eclipse.emf.emfstore.test.common",o
  rg.eclipse.emf.emfstore.internal.server.connection.xmlrpc.util;versio
- n="1.7.0";x-friends:="org.eclipse.emf.emfstore.client,org.eclipse.emf
+ n="1.8.0";x-friends:="org.eclipse.emf.emfstore.client,org.eclipse.emf
  .emfstore.test.common",org.eclipse.emf.emfstore.internal.server.core;
- version="1.7.0";x-friends:="org.eclipse.emf.emfstore.test.common",org
- .eclipse.emf.emfstore.internal.server.core.helper;version="1.7.0";x-i
+ version="1.8.0";x-friends:="org.eclipse.emf.emfstore.test.common",org
+ .eclipse.emf.emfstore.internal.server.core.helper;version="1.8.0";x-i
  nternal:=true,org.eclipse.emf.emfstore.internal.server.core.subinterf
- aces;version="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.intern
- al.server.exceptions;version="1.7.0"; x-friends:="org.eclipse.emf.emf
+ aces;version="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.intern
+ al.server.exceptions;version="1.8.0"; x-friends:="org.eclipse.emf.emf
  store.client,  org.eclipse.emf.emfstore.client.test.common,  org.ecli
  pse.emf.emfstore.client.test.ui,  org.eclipse.emf.emfstore.client.ui,
    org.eclipse.emf.emfstore.example.merging,  org.eclipse.emf.emfstore
  .test.common,  org.eclipse.emf.emfstore.server.test,  org.eclipse.emf
  .ecp.emfstore.ui,  org.eclipse.emf.emfstore.client.api.test",org.ecli
- pse.emf.emfstore.internal.server.filetransfer;version="1.7.0";x-frien
+ pse.emf.emfstore.internal.server.filetransfer;version="1.8.0";x-frien
  ds:="org.eclipse.emf.emfstore.client,org.eclipse.emf.emfstore.test.co
- mmon",org.eclipse.emf.emfstore.internal.server.impl.api;version="1.7.
+ mmon",org.eclipse.emf.emfstore.internal.server.impl.api;version="1.8.
  0";x-friends:="org.eclipse.emf.emfstore.client,org.eclipse.emf.emfsto
  re.client.ui",org.eclipse.emf.emfstore.internal.server.startup;versio
- n="1.7.0";x-friends:="org.eclipse.emf.emfstore.client",org.eclipse.em
- f.emfstore.internal.server.storage;version="1.7.0";x-internal:=true,o
- rg.eclipse.emf.emfstore.server;version="1.7.0",org.eclipse.emf.emfsto
- re.server.auth;version="1.7.0",org.eclipse.emf.emfstore.server.except
- ions;version="1.7.0",org.eclipse.emf.emfstore.server.observer;version
- ="1.7.0"
+ n="1.8.0";x-friends:="org.eclipse.emf.emfstore.client",org.eclipse.em
+ f.emfstore.internal.server.storage;version="1.8.0";x-internal:=true,o
+ rg.eclipse.emf.emfstore.server;version="1.8.0",org.eclipse.emf.emfsto
+ re.server.auth;version="1.8.0",org.eclipse.emf.emfstore.server.except
+ ions;version="1.8.0",org.eclipse.emf.emfstore.server.observer;version
+ ="1.8.0"
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.servlet;version="[2.0.0,4.0.0)";resolution:=optional,
  javax.servlet.http;version="[2.0.0,4.0.0)";resolution:=optional,
diff --git a/bundles/org.eclipse.emf.emfstore.server/pom.xml b/bundles/org.eclipse.emf.emfstore.server/pom.xml
index 39f0552..4d5e7ef 100644
--- a/bundles/org.eclipse.emf.emfstore.server/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.server/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-bundles-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.server</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/features/org.eclipse.emf.emfstore.client.feature/feature.xml b/features/org.eclipse.emf.emfstore.client.feature/feature.xml
index f47486f..d7d2f98 100644
--- a/features/org.eclipse.emf.emfstore.client.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.client.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.client.feature"
       label="EMFStore Client"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.client"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature contains all plugins to contact the EMFStore server from a client application.
diff --git a/features/org.eclipse.emf.emfstore.client.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.feature/pom.xml
index 5627b29..753045c 100644
--- a/features/org.eclipse.emf.emfstore.client.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.client.transaction.feature/feature.xml b/features/org.eclipse.emf.emfstore.client.transaction.feature/feature.xml
index 95c082f..f4e30d4 100644
--- a/features/org.eclipse.emf.emfstore.client.transaction.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.client.transaction.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.client.transaction.feature"
       label="EMFStore Transaction Support"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.client.transaction"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature adds transaction support to EMFStore based on EMF Transaction. It automatically registers an TransactionalEditingDomain with the EMFStore.
diff --git a/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml
index 2cd7ad0..e7b994e 100644
--- a/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.transaction.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.client.ui.feature/feature.xml b/features/org.eclipse.emf.emfstore.client.ui.feature/feature.xml
index 74dbfca..a8693fe 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.client.ui.feature"
       label="EMFStore Client UI"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.client.ui"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature contains all plugins to provide user interfaces
diff --git a/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml
index e084185..38c4d91 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/feature.xml b/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/feature.xml
index f1a0e02..e6b5d7d 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature"
       label="HistoryBrowserComparator"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.client.ui.historybrowsercomparator"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature adds a comparator to EMFStore&apos;s history browser.
@@ -23,8 +23,8 @@
    <requires>
       <import plugin="org.eclipse.emf.compare" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.compare" version="3.5.300" match="compatible"/>
-      <import plugin="org.eclipse.emf.emfstore.client" version="1.7.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.emfstore.client.ui" version="1.7.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.emfstore.client" version="1.8.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.emfstore.client.ui" version="1.8.0" match="compatible"/>
       <import plugin="org.eclipse.emf.compare.ide.ui" version="4.0.0" match="compatible"/>
       <import plugin="org.eclipse.emf.compare.ide" version="3.1.0" match="compatible"/>
       <import plugin="org.eclipse.emf.compare.edit" version="4.0.0" match="compatible"/>
diff --git a/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml
index c358ecd..98a017a 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.client.ui.rap.feature/feature.xml b/features/org.eclipse.emf.emfstore.client.ui.rap.feature/feature.xml
index 712c37f..0152e9c 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.rap.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.rap.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.client.ui.rap.feature"
       label="EMFStore Client UI RAP"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.client.ui"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature contains all plugins to provide user interfaces
diff --git a/features/org.eclipse.emf.emfstore.client.ui.rap.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.ui.rap.feature/pom.xml
index fb8ced3..d7dbee8 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.rap.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.rap.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui.rap.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.common.feature/feature.xml b/features/org.eclipse.emf.emfstore.common.feature/feature.xml
index 2a1e8fa..54ac5a8 100644
--- a/features/org.eclipse.emf.emfstore.common.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.common.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.common.feature"
       label="EMFStore Common"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.common"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       Contains common plugins of EMFStore that are used by other EMFStore features.
diff --git a/features/org.eclipse.emf.emfstore.common.feature/pom.xml b/features/org.eclipse.emf.emfstore.common.feature/pom.xml
index 11f364f..7852874 100644
--- a/features/org.eclipse.emf.emfstore.common.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.common.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.common.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/feature.xml b/features/org.eclipse.emf.emfstore.ecore.feature/feature.xml
index f158b15..656a9a7 100644
--- a/features/org.eclipse.emf.emfstore.ecore.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.ecore.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.ecore.feature"
       label="EMFStore Ecore"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.ecore"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       Contains ecore plugin of EMFStore that is used by other EMFStore features.
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/pom.xml b/features/org.eclipse.emf.emfstore.ecore.feature/pom.xml
index cca0f71..726fbe3 100644
--- a/features/org.eclipse.emf.emfstore.ecore.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.ecore.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.ecore.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.example.feature/feature.xml b/features/org.eclipse.emf.emfstore.example.feature/feature.xml
index 1404166..501ce7f 100644
--- a/features/org.eclipse.emf.emfstore.example.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.example.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.example.feature"
       label="EMFStore Code Examples"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.example.installer"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org ">
       EMFStore Code Examples
diff --git a/features/org.eclipse.emf.emfstore.example.feature/pom.xml b/features/org.eclipse.emf.emfstore.example.feature/pom.xml
index 79266ff..3a736bd 100644
--- a/features/org.eclipse.emf.emfstore.example.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.example.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.example.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml b/features/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
index d220d53..10fcafe 100644
--- a/features/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.fuzzy.feature"
       label="Fuzzy Testing Feature"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.branding"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature contains the fuzzy testing framework and the EMFDataProvider
diff --git a/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml b/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
index d150fd3..8dab069 100644
--- a/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.fuzzy.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml b/features/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
index 86990ce..e779354 100644
--- a/features/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.emfstore.fuzzy.test.feature"
       label="EMFStore Fuzzy Tests"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://www.example.com/description">
       This feature contains the integration plugins for EMFStore with fuzzy testing.
diff --git a/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml b/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
index aded925..bf3c0d4 100644
--- a/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.fuzzy.test.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.emfstore.license.feature/feature.xml b/features/org.eclipse.emf.emfstore.license.feature/feature.xml
index b15a39a..be551c9 100644
--- a/features/org.eclipse.emf.emfstore.license.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.license.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.emfstore.license.feature"
       label="EMFStore License"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <description>
diff --git a/features/org.eclipse.emf.emfstore.license.feature/pom.xml b/features/org.eclipse.emf.emfstore.license.feature/pom.xml
index 0152966..cae0d98 100644
--- a/features/org.eclipse.emf.emfstore.license.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.license.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.license.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml b/features/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
index 7efe155..7fab61c 100644
--- a/features/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.emfstore.migration.edapt.feature"
       label="EMFStore Edapt Migration"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature contains all plugins to migrate EMFStore-hosted
@@ -222,12 +222,12 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.emf.emfstore.migration" version="1.7.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.emfstore.migration" version="1.8.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common" version="2.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.edapt.migration" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.edapt.history" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.emfstore.common.model" version="1.7.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.emfstore.common.model" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.emf.emfstore.migration.edapt.feature/pom.xml b/features/org.eclipse.emf.emfstore.migration.edapt.feature/pom.xml
index 22e4623..5a13967 100644
--- a/features/org.eclipse.emf.emfstore.migration.edapt.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.migration.edapt.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.migration.edapt.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.modelmutator.feature/feature.xml b/features/org.eclipse.emf.emfstore.modelmutator.feature/feature.xml
index ab743a6..0ef7c7b 100644
--- a/features/org.eclipse.emf.emfstore.modelmutator.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.modelmutator.feature/feature.xml
@@ -6,7 +6,7 @@
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.modelmutator"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       Contains a set of plugins that may be used to alter existing
diff --git a/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml b/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml
index aa1b8a4..2e7653c 100644
--- a/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/features/org.eclipse.emf.emfstore.mongodb.client.feature/feature.xml b/features/org.eclipse.emf.emfstore.mongodb.client.feature/feature.xml
index 215b3d9..a2528a0 100644
--- a/features/org.eclipse.emf.emfstore.mongodb.client.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.mongodb.client.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.mongodb.client.feature"
       label="EMFStore mongoDB Client Feature"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.mongodb.client"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature contains all plugins to run the EMFStore client
diff --git a/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml b/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml
index c7374e0..2c6f9d8 100644
--- a/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.mongodb.client.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.mongodb.server.feature/feature.xml b/features/org.eclipse.emf.emfstore.mongodb.server.feature/feature.xml
index 10a2f62..1825452 100644
--- a/features/org.eclipse.emf.emfstore.mongodb.server.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.mongodb.server.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.mongodb.server.feature"
       label="EMFStore mongoDB Server Feature"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.mongodb.server"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature contains all plugins to run the EMFStore server
diff --git a/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml b/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml
index 11dff03..22ac5b5 100644
--- a/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.mongodb.server.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.sdk.feature/feature.xml b/features/org.eclipse.emf.emfstore.sdk.feature/feature.xml
index eb927a9..f68a55b 100644
--- a/features/org.eclipse.emf.emfstore.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.sdk.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.sdk.feature"
       label="EMFStore SDK"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.branding"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature contains all core plugins including sources to use the EMFStore.
diff --git a/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml b/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml
index c86df92..10e592e 100644
--- a/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.sdk.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.emfstore.server.feature/feature.xml b/features/org.eclipse.emf.emfstore.server.feature/feature.xml
index 9ffa685..60df487 100644
--- a/features/org.eclipse.emf.emfstore.server.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.server.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.server.feature"
       label="EMFStore Server"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.server"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature contains all plugins to run the EMFStore server.
diff --git a/features/org.eclipse.emf.emfstore.server.feature/pom.xml b/features/org.eclipse.emf.emfstore.server.feature/pom.xml
index 783eb44..01ab90f 100644
--- a/features/org.eclipse.emf.emfstore.server.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.server.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.server.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.emf.emfstore.test.feature/feature.xml b/features/org.eclipse.emf.emfstore.test.feature/feature.xml
index e51dae1..62ae06a 100644
--- a/features/org.eclipse.emf.emfstore.test.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.test.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.emfstore.test.feature"
       label="EMFStore Tests"
-      version="1.7.0.qualifier"
+      version="1.8.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.emfstore.branding"
       license-feature="org.eclipse.emf.emfstore.license.feature"
-      license-feature-version="1.7.0.qualifier">
+      license-feature-version="1.8.0.qualifier">
 
    <description url="http://emfstore.org">
       This feature contains all test plugins as well as helper and utility classes to write custom EMFStore tests.
diff --git a/features/org.eclipse.emf.emfstore.test.feature/pom.xml b/features/org.eclipse.emf.emfstore.test.feature/pom.xml
index f2d87eb..bbc0f58 100644
--- a/features/org.eclipse.emf.emfstore.test.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.test.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-features-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.test.feature</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/releng/_target/pom.xml b/releng/_target/pom.xml
index 762ab9e..b105211 100644
--- a/releng/_target/pom.xml
+++ b/releng/_target/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/emfstore-parent/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>emfstore</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-target-definition</packaging>
 </project>
\ No newline at end of file
diff --git a/releng/emfstore-parent/pom.xml b/releng/emfstore-parent/pom.xml
index 0322be1..3b8bc2a 100644
--- a/releng/emfstore-parent/pom.xml
+++ b/releng/emfstore-parent/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.eclipse.emf.emfstore</groupId>
 	<artifactId>emfstore-parent</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -16,8 +16,8 @@
 		<maven-checkstyle-version>2.10</maven-checkstyle-version>
 		<jacoco-version>0.7.4.201502262128</jacoco-version>
 		<javadoc-version>2.9</javadoc-version>
-		<javadoc-title>EMFStore 1.7.0 API</javadoc-title>
-		<emfstore-version>1.7.0-SNAPSHOT</emfstore-version>
+		<javadoc-title>EMFStore 1.8.0 API</javadoc-title>
+		<emfstore-version>1.8.0-SNAPSHOT</emfstore-version>
 		<jarsigner-version>1.0.5</jarsigner-version>
 		<maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
 		<!-- Properties to enable jacoco code coverage analysis with sonar -->
diff --git a/releng/org.eclipse.emf.emfstore.p2repository/category.xml b/releng/org.eclipse.emf.emfstore.p2repository/category.xml
index ff71433..dc976c2 100644
--- a/releng/org.eclipse.emf.emfstore.p2repository/category.xml
+++ b/releng/org.eclipse.emf.emfstore.p2repository/category.xml
@@ -48,7 +48,7 @@
    <feature id="org.eclipse.emf.emfstore.client.ui.rap.feature" version="0.0.0">
       <category name="org.eclipse.emf.emfstore.other"/>
    </feature>
-   <feature url="features/org.eclipse.emf.emfstore.migration.edapt.feature_1.7.0.qualifier.jar" id="org.eclipse.emf.emfstore.migration.edapt.feature" version="1.7.0.qualifier">
+   <feature id="org.eclipse.emf.emfstore.migration.edapt.feature" version="0.0.0">
       <category name="org.eclipse.emf.emfstore.other"/>
    </feature>
    <category-def name="org.eclipse.emf.emfstore.core" label="EMFStore Core Features">
diff --git a/releng/org.eclipse.emf.emfstore.p2repository/pom.xml b/releng/org.eclipse.emf.emfstore.p2repository/pom.xml
index 5709568..1085ac6 100644
--- a/releng/org.eclipse.emf.emfstore.p2repository/pom.xml
+++ b/releng/org.eclipse.emf.emfstore.p2repository/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.eclipse.emf.emfstore</groupId>
         <artifactId>emfstore-parent</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../emfstore-parent/</relativePath>
     </parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>org.eclipse.emf.emfstore.p2repository</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <packaging>eclipse-repository</packaging>
     
     <!-- see http://www.codetrails.com/blog/maven-tycho-how-to-configure-your-repos-mirror-and-statistics-uris -->
diff --git a/releng/org.eclipse.emf.emfstore.products/pom.xml b/releng/org.eclipse.emf.emfstore.products/pom.xml
index d995743..d451939 100644
--- a/releng/org.eclipse.emf.emfstore.products/pom.xml
+++ b/releng/org.eclipse.emf.emfstore.products/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../emfstore-parent/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.products</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <build>
diff --git a/releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml b/releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml
index cf3f4b1..40479bf 100644
--- a/releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml
+++ b/releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.emfstore</groupId>
 		<artifactId>emfstore-parent</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>1.8.0-SNAPSHOT</version>
 		<relativePath>../emfstore-parent/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.emfstore</groupId>
 	<artifactId>emfstore-bundles-parent</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/releng/org.eclipse.emf.emfstore.releng.features/pom.xml b/releng/org.eclipse.emf.emfstore.releng.features/pom.xml
index 19cc188..2b8086a 100644
--- a/releng/org.eclipse.emf.emfstore.releng.features/pom.xml
+++ b/releng/org.eclipse.emf.emfstore.releng.features/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.emfstore</groupId>
 		<artifactId>emfstore-parent</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>1.8.0-SNAPSHOT</version>
 		<relativePath>../emfstore-parent/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.emfstore</groupId>
 	<artifactId>emfstore-features-parent</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/releng/org.eclipse.emf.emfstore.releng.tests/pom.xml b/releng/org.eclipse.emf.emfstore.releng.tests/pom.xml
index 2b36ac3..176b90f 100644
--- a/releng/org.eclipse.emf.emfstore.releng.tests/pom.xml
+++ b/releng/org.eclipse.emf.emfstore.releng.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.emfstore</groupId>
 		<artifactId>emfstore-parent</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>1.8.0-SNAPSHOT</version>
 		<relativePath>../emfstore-parent/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.emfstore</groupId>
 	<artifactId>emfstore-tests-parent</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.api.test/META-INF/MANIFEST.MF
index 93b7af2..3540096 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Client API Tests
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.api.test
-Bundle-Version: 1.7.0.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.7.0"
+Bundle-Version: 1.8.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.8.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.emfstore.client.api.test;version="1.7.
+Export-Package: org.eclipse.emf.emfstore.client.api.test;version="1.8.
  0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)",
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.api.test/pom.xml
index 2683c9d..f10e262 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/pom.xml
@@ -6,13 +6,13 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-tests-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.api.test</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
     <build>
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.changetracking.test/META-INF/MANIFEST.MF
index 847e446..4aea1eb 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Changetracking Tests
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.changetracking.test
-Bundle-Version: 1.7.0.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.7.0"
+Bundle-Version: 1.8.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.8.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.emfstore.modelmutator;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.emf.emfstore.client.changetracking.test;ve
- rsion="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.client.change
- tracking.test.canonization;version="1.7.0";x-internal:=true,org.eclip
- se.emf.emfstore.client.changetracking.test.command;version="1.7.0";x-
+ rsion="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.client.change
+ tracking.test.canonization;version="1.8.0";x-internal:=true,org.eclip
+ se.emf.emfstore.client.changetracking.test.command;version="1.8.0";x-
  internal:=true,org.eclipse.emf.emfstore.client.changetracking.test.no
- tification;version="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.
- client.changetracking.test.toplogy;version="1.7.0";x-internal:=true
+ tification;version="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.
+ client.changetracking.test.toplogy;version="1.8.0";x-internal:=true
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.changetracking.test/pom.xml
index 50b4fdb..e2e0cef 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.emfstore</groupId>
 		<artifactId>emfstore-tests-parent</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>1.8.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.emf.emfstore</groupId>
 	<artifactId>org.eclipse.emf.emfstore.client.changetracking.test</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/META-INF/MANIFEST.MF
index a7503f0..e7e10b9 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.conflictdetection.test
-Bundle-Version: 1.7.0.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.7.0"
+Bundle-Version: 1.8.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.8.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.emf.emfstore.client.conflictdetection.test
- ;version="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.client.con
- flictdetection.test.merging;version="1.7.0";x-internal:=true; uses:="
+ ;version="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.client.con
+ flictdetection.test.merging;version="1.8.0";x-internal:=true; uses:="
  org.eclipse.emf.emfstore.internal.common.model,  org.eclipse.emf.ecor
  e,  org.eclipse.emf.emfstore.internal.client.model.changeTracking.mer
  ging,  org.eclipse.emf.emfstore.internal.client.model,  org.eclipse.e
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/pom.xml
index d1dec39..3b69b43 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.emfstore</groupId>
 		<artifactId>emfstore-tests-parent</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>1.8.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.emf.emfstore</groupId>
 	<artifactId>org.eclipse.emf.emfstore.client.conflictdetection.test</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.emfstore.client.example.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.example.test/META-INF/MANIFEST.MF
index c5f0d35..36c5a88 100644
--- a/tests/org.eclipse.emf.emfstore.client.example.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.example.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore API Test
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.example.test
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.emfstore.example.merging;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.example.helloworld;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="[1.7.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.example.merging;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.example.helloworld;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="[1.8.0,2.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.emf.emfstore.client.example.test;version="
- 1.7.0";x-internal:=true
+ 1.8.0";x-internal:=true
diff --git a/tests/org.eclipse.emf.emfstore.client.example.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.example.test/pom.xml
index eee8017..a9ff37d 100644
--- a/tests/org.eclipse.emf.emfstore.client.example.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.example.test/pom.xml
@@ -6,13 +6,13 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-tests-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.example.test</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
 <build>
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.recording.test/META-INF/MANIFEST.MF
index 82b9d97..f477ba4 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.recording.test
-Bundle-Version: 1.7.0.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.7.0"
+Bundle-Version: 1.8.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.8.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.emf.emfstore.client.recording.test;version
- ="1.7.0";x-internal:=true
+ ="1.8.0";x-internal:=true
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.recording.test/pom.xml
index c274331..45263ff 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/pom.xml
@@ -6,13 +6,13 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-tests-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.recording.test</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
 <build>
diff --git a/tests/org.eclipse.emf.emfstore.client.test.alltests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.test.alltests/META-INF/MANIFEST.MF
index 80bbf33..92d1fa3 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.alltests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.test.alltests/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@
 Bundle-Activator: org.eclipse.emf.emfstore.client.test.alltests.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.emfstore.client.test;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.emfstore.client.test.ui;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="1.7.0",
+ org.eclipse.emf.emfstore.client.test.ui;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="1.8.0",
  org.junit;bundle-version="4.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.test.ui/META-INF/MANIFEST.MF
index 33c47f2..90332ac 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Client UI Tests
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.test.ui;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.emfstore.client.test;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.emfstore.client.ui;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.emf.emfstore.client.ui;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.swtbot.eclipse.core;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.swtbot.eclipse.finder;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.swtbot.forms.finder;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.swtbot.junit4_x;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.core.expressions;bundle-version="3.4.401"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.emf.emfstore.client.test.ui.Activator
 Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.emfstore.client.test.ui;version="1.7.0
+Export-Package: org.eclipse.emf.emfstore.client.test.ui;version="1.8.0
  ";x-internal:=true,org.eclipse.emf.emfstore.client.test.ui.conflictde
- tection;version="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.cli
- ent.test.ui.controllers;version="1.7.0";x-internal:=true,org.eclipse.
- emf.emfstore.client.test.ui.testers;version="1.7.0"
+ tection;version="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.cli
+ ent.test.ui.controllers;version="1.8.0";x-internal:=true,org.eclipse.
+ emf.emfstore.client.test.ui.testers;version="1.8.0"
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml b/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
index 65ec3c8..0d49351 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.emfstore</groupId>
 		<artifactId>emfstore-tests-parent</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>1.8.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.emf.emfstore</groupId>
 	<artifactId>org.eclipse.emf.emfstore.client.test.ui</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.emfstore.client.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.test/META-INF/MANIFEST.MF
index 5c2dd71..f7cab08 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.test/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.7.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.emfstore.client.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.test/pom.xml
index 8ee0b95..f429ea2 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.test/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-tests-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.emf.emfstore.client.ui.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.ui.test/META-INF/MANIFEST.MF
index 0d594b2..eb5da8b 100644
--- a/tests/org.eclipse.emf.emfstore.client.ui.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.ui.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Client UI Tests
 Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui.test
-Bundle-Version: 1.7.0.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="[1.7.0,2.0.0)"
+Bundle-Version: 1.8.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="[1.8.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.emfstore.client.ui.test;version="1.7.0
+Export-Package: org.eclipse.emf.emfstore.client.ui.test;version="1.8.0
  ";x-internal:=true,org.eclipse.emf.emfstore.internal.client.ui.common
- ;version="1.7.0";x-internal:=true
+ ;version="1.8.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)"
diff --git a/tests/org.eclipse.emf.emfstore.client.ui.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.ui.test/pom.xml
index 20b356e..5b70236 100644
--- a/tests/org.eclipse.emf.emfstore.client.ui.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.ui.test/pom.xml
@@ -6,13 +6,13 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-tests-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.client.ui.test</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
     <build>
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/pom.xml b/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/pom.xml
index 9e9ef8d..7e7dd3a 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-tests-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml
index f2a8ce8..936dea9 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-tests-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
   <groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/tests/org.eclipse.emf.emfstore.migration.edapt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.migration.edapt.test/META-INF/MANIFEST.MF
index d2c4f21..61331ff 100644
--- a/tests/org.eclipse.emf.emfstore.migration.edapt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.migration.edapt.test/META-INF/MANIFEST.MF
@@ -2,22 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.emfstore.migration.edapt.test;singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-ClassPath: .
-Fragment-Host: org.eclipse.emf.emfstore.migration.edapt;bundle-version="[1.7.0,2.0.0)"
+Fragment-Host: org.eclipse.emf.emfstore.migration.edapt;bundle-version="[1.8.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfstore.internal.migration.edapt;version="1.7.0";x-internal:=true,
- org.eclipse.emf.emfstore.internal.migration.edapt.test;version="1.7.0";x-internal:=true,
- org.eclipse.emf.emfstore.migration.edapt.test.model.a.model;version="1.7.0",
- org.eclipse.emf.emfstore.migration.edapt.test.model.a.model.impl;version="1.7.0",
- org.eclipse.emf.emfstore.migration.edapt.test.model.a.model.util;version="1.7.0",
- org.eclipse.emf.emfstore.migration.edapt.test.model.d.model;version="1.7.0",
- org.eclipse.emf.emfstore.migration.edapt.test.model.d.model.impl;version="1.7.0",
- org.eclipse.emf.emfstore.migration.edapt.test.model.d.model.util;version="1.7.0"
+Export-Package: org.eclipse.emf.emfstore.internal.migration.edapt;vers
+ ion="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.internal.migrat
+ ion.edapt.test;version="1.8.0";x-internal:=true,org.eclipse.emf.emfst
+ ore.migration.edapt.test.model.a.model;version="1.8.0",org.eclipse.em
+ f.emfstore.migration.edapt.test.model.a.model.impl;version="1.8.0",or
+ g.eclipse.emf.emfstore.migration.edapt.test.model.a.model.util;versio
+ n="1.8.0",org.eclipse.emf.emfstore.migration.edapt.test.model.d.model
+ ;version="1.8.0",org.eclipse.emf.emfstore.migration.edapt.test.model.
+ d.model.impl;version="1.8.0",org.eclipse.emf.emfstore.migration.edapt
+ .test.model.d.model.util;version="1.8.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.client;bundle-version="[1.7.0,2.0.0)"
+ org.eclipse.emf.emfstore.client;bundle-version="[1.8.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.emfstore.migration.edapt.test/pom.xml b/tests/org.eclipse.emf.emfstore.migration.edapt.test/pom.xml
index 0b0af12..09b6552 100644
--- a/tests/org.eclipse.emf.emfstore.migration.edapt.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.migration.edapt.test/pom.xml
@@ -6,13 +6,13 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-tests-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.emfstore</groupId>
   <artifactId>org.eclipse.emf.emfstore.migration.edapt.test</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   
   <build>
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.performance.test/META-INF/MANIFEST.MF
index 0d2b4b5..b249eff 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.performance.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Performance Tests
 Bundle-SymbolicName: org.eclipse.emf.emfstore.performance.test
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.emfstore.modelmutator,
  org.eclipse.emf.emfstore.server,
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/pom.xml b/tests/org.eclipse.emf.emfstore.performance.test/pom.xml
index a118e47..636cfc3 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.performance.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.emfstore</groupId>
 		<artifactId>emfstore-tests-parent</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>1.8.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.emf.emfstore</groupId>
 	<artifactId>org.eclipse.emf.emfstore.performance.test</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.emfstore.server.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.server.test/META-INF/MANIFEST.MF
index 02e9a1c..17ae563 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.server.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFStore Server Tests
 Bundle-SymbolicName: org.eclipse.emf.emfstore.server.test
-Bundle-Version: 1.7.0.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.7.0"
+Bundle-Version: 1.8.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.8.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.emfstore.server;bundle-version="[1.7.0,2.0.0)"
+ org.eclipse.emf.emfstore.server;bundle-version="[1.8.0,2.0.0)"
 Export-Package: org.eclipse.emf.emfstore.server.accesscontrol.test;ver
- sion="1.7.0";x-internal:=true,org.eclipse.emf.emfstore.server.test;ve
- rsion="1.7.0";x-internal:=true
+ sion="1.8.0";x-internal:=true,org.eclipse.emf.emfstore.server.test;ve
+ rsion="1.8.0";x-internal:=true
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.emfstore.server.test/pom.xml b/tests/org.eclipse.emf.emfstore.server.test/pom.xml
index 5157d88..31f2173 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.server.test/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.emfstore</groupId>
 		<artifactId>emfstore-tests-parent</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>1.8.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.emf.emfstore</groupId>
 	<artifactId>org.eclipse.emf.emfstore.server.test</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.emfstore.test.common/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.test.common/META-INF/MANIFEST.MF
index 36d3563..cbaa868 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.test.common/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.emf.emfstore.test.model;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.client;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.client;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.emfstore.test.model.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.8.1,4.0.0)"
 Export-Package: org.eclipse.emf.emfstore.client.test.common;version="2.0.0";x-friends:="org.eclipse.emf.emfstore.client.api.test",
diff --git a/tests/org.eclipse.emf.emfstore.test.common/pom.xml b/tests/org.eclipse.emf.emfstore.test.common/pom.xml
index e88b746..e46a8b9 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.test.common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-tests-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/pom.xml b/tests/org.eclipse.emf.emfstore.test.model.edit/pom.xml
index fde8de0..45e7089 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-tests-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model/pom.xml b/tests/org.eclipse.emf.emfstore.test.model/pom.xml
index 15e8d25..3eeb069 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.test.model/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.emf.emfstore</groupId>
     <artifactId>emfstore-tests-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
   </parent>