Merge branch 'dev' into mkoller/atfxadapter

Conflicts:
	build.gradle


Signed-off-by: Matthias Koller <m.koller@peak-solution.de>
diff --git a/build.gradle b/build.gradle
index 08b6ebd..f2d9766 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@
 
 description = 'MDM API - Base Model'
 group = 'org.eclipse.mdm'
-version = '5.1.0M6-SNAPSHOT'
+version = '5.1.0M6-ATFX-SNAPSHOT'
 
 apply plugin: 'java'
 apply plugin: 'maven'