diff --git a/BudgetMasterClient/pom.xml b/BudgetMasterClient/pom.xml
index 0fd1b201a4cdfd1bc86058a0aba07acd18e5f381..b0fdd520948f2ecc4bc83b02386548fb4d112f37 100644
--- a/BudgetMasterClient/pom.xml
+++ b/BudgetMasterClient/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.deadlocker8</groupId>
 	<artifactId>BudgetMasterClient</artifactId>
-	<version>1.6.0</version>
+	<version>1.7.0_alpha</version>
 	<name>BudgetMasterClient</name>
 	<build>
 		<plugins>
@@ -15,6 +15,31 @@
 					<source>1.8</source>
 					<target>1.8</target>
 				</configuration>
+			</plugin>			
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<outputDirectory>../build/${project.version}</outputDirectory>
+					<finalName>BudgetMasterClient-v${project.version}</finalName>
+					<appendAssemblyId>false</appendAssemblyId>
+					<archive>
+						<manifest>
+							<mainClass>de.deadlocker8.budgetmasterclient.main.Main</mainClass>
+						</manifest>
+					</archive>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id> <!-- this is used for inheritance merges -->
+						<phase>package</phase> <!-- bind to the packaging phase -->
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			<!-- LAUNCH4J -->
 			<plugin>
@@ -48,31 +73,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<outputDirectory>../build/${project.version}</outputDirectory>
-					<finalName>BudgetMasterClient-v${project.version}</finalName>
-					<appendAssemblyId>false</appendAssemblyId>
-					<archive>
-						<manifest>
-							<mainClass>de.deadlocker8.budgetmasterclient.main.Main</mainClass>
-						</manifest>
-					</archive>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- bind to the packaging phase -->
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
index 2fe54cb3804f9a60d4be2a055cff28e541f44937..0760336d21dd149b20b543f469301b28c6f7db20 100644
--- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
@@ -1,7 +1,7 @@
 # DEFAULT
 app.name=BudgetMaster
-version.code=10
-version.name=1.6.0
+version.code=11
+version.name=1.7.0_alpha
 version.date=03.10.17
 author=Robert Goldmann
 credits=L�nderflaggen von Freepik auf https://www.flaticon.com\nVerwendete Schriftarten: OpenSans
diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
index 6938be4dee674457b0327cf1d4e1b2edadf1c61a..778db0500f2b34f0fae979f979c1d111c3c53391 100644
--- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
@@ -1,7 +1,7 @@
 # DEFAULT
 app.name=BudgetMaster
-version.code=10
-version.name=1.6.0
+version.code=11
+version.name=1.7.0_alpha
 version.date=03.10.17
 author=Robert Goldmann
 credits=Flags by Freepik on https://www.flaticon.com\nFonts used: OpenSans
diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml
index f0aff38da07c472479abd04afc342b0dc32962e4..b9d7f0dbad7d1240133c97dfdb9d3e12763acd46 100644
--- a/BudgetMasterServer/pom.xml
+++ b/BudgetMasterServer/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.deadlocker8</groupId>
 	<artifactId>BudgetMasterServer</artifactId>
-	<version>1.6.0</version>
+	<version>1.7.0_alpha</version>
 	<name>BudgetMasterServer</name>
 	<build>
 		<plugins>
diff --git a/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties b/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties
index 8de2a69fbfed7d822d9ebdf32a042ce1c98893ef..df6e79da5a70bdf490ae74c08d38ab70cb375bd4 100644
--- a/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties
+++ b/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties
@@ -1,6 +1,6 @@
 app.name=BudgetMasterServer
-version.code=10
-version.name=1.6.0
+version.code=11
+version.name=1.7.0_alpha
 version.date=03.10.17
 author=Robert Goldmann