Merge branch 'master' into Version-2

# Conflicts:
#	kop-common-dependencies/pom.xml
#	kop-common-parent/pom.xml

kop-common-dependencies/pom.xml

@@ -133,6 +133,11 @@
 				<version>${pluto.version}</version>
 				<scope>test</scope>
 			</dependency>
+			<dependency>
+				<groupId>de.itvsh.ozg.pluto</groupId>
+				<artifactId>pluto-command</artifactId>
+				<version>${pluto.version}</version>
+			</dependency>
 
 			<!-- spring -->
 			<dependency>