Merge remote-tracking branch 'remotes/origin/develop'
diff --git a/Jenkinsfile b/Jenkinsfile
index 0ab2df5..631eea7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,8 +33,8 @@
 		stage("Publish Checkstyle & PMD & Findbugs Results"){
 			steps {
 				checkstyle canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '**/checkstyle-result*.xml', unHealthy: '', unstableTotalAll:'0'
-				pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '**/target/pmd.xml', unHealthy: ''
-				findbugs canComputeNew: false, defaultEncoding: '', excludePattern: '', healthy: '', includePattern: '', pattern: '**/findbugsXml.xml', unHealthy: ''
+				pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '**/target/pmd.xml', unHealthy: '', unstableTotalAll:'0'
+				findbugs canComputeNew: false, defaultEncoding: '', excludePattern: '', healthy: '', includePattern: '', pattern: '**/findbugsXml.xml', unHealthy: '', unstableTotalAll:'0'
 			}
 		}
 		
@@ -53,7 +53,7 @@
             }
 		}
 		
-		stage ('deploy release') {
+		stage ('deploy releases') {
 			when {
 				 branch 'master'
 			}
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/Abstract_StaticTopology_OpenKonsequenz_Mapper.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/Abstract_StaticTopology_OpenKonsequenz_Mapper.java
index 2f6138c..0807f3d 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/Abstract_StaticTopology_OpenKonsequenz_Mapper.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/Abstract_StaticTopology_OpenKonsequenz_Mapper.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.mapper;
 
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/PowerSystemResourceTypes_StaticTopology_Cim17v07_Mapper.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/PowerSystemResourceTypes_StaticTopology_Cim17v07_Mapper.java
index e5697a6..a88eb94 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/PowerSystemResourceTypes_StaticTopology_Cim17v07_Mapper.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/PowerSystemResourceTypes_StaticTopology_Cim17v07_Mapper.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.mapper;
 
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/PowerSystemResources_StaticTopology_Cim17v07_Mapper.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/PowerSystemResources_StaticTopology_Cim17v07_Mapper.java
index 40551d0..2936067 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/PowerSystemResources_StaticTopology_Cim17v07_Mapper.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/PowerSystemResources_StaticTopology_Cim17v07_Mapper.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.mapper;
 
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/Topology_StaticTopology_Cim17v07_Mapper.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/Topology_StaticTopology_Cim17v07_Mapper.java
index 95c09ae..e39d8a8 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/Topology_StaticTopology_Cim17v07_Mapper.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/mapper/Topology_StaticTopology_Cim17v07_Mapper.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.mapper;
 
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/ConnectedConnectingEquipments_1_ApplicationXml_Responder.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/ConnectedConnectingEquipments_1_ApplicationXml_Responder.java
index ddaa293..00a6d05 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/ConnectedConnectingEquipments_1_ApplicationXml_Responder.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/ConnectedConnectingEquipments_1_ApplicationXml_Responder.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.responder;
 
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/PowerSystemResourceTypes_1_ApplicationXml_Responder.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/PowerSystemResourceTypes_1_ApplicationXml_Responder.java
index 2ec53b5..8b5a368 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/PowerSystemResourceTypes_1_ApplicationXml_Responder.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/PowerSystemResourceTypes_1_ApplicationXml_Responder.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.responder;
 
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/PowerSystemResources_1_ApplicationXml_Responder.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/PowerSystemResources_1_ApplicationXml_Responder.java
index fe56d5b..b196803 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/PowerSystemResources_1_ApplicationXml_Responder.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/PowerSystemResources_1_ApplicationXml_Responder.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.responder;
 
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/Topology_2_ApplicationRdf_Responder.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/Topology_2_ApplicationRdf_Responder.java
index 6530761..9c93773 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/Topology_2_ApplicationRdf_Responder.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/Topology_2_ApplicationRdf_Responder.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.responder;
 
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/ConnectedConnectingEquipmentsRequestParameters.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/ConnectedConnectingEquipmentsRequestParameters.java
index da96535..df8b6f4 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/ConnectedConnectingEquipmentsRequestParameters.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/ConnectedConnectingEquipmentsRequestParameters.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.responder.parameters;
 
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/PowerSystemResourceTypes_1_ApplicationXml_RequestParameters.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/PowerSystemResourceTypes_1_ApplicationXml_RequestParameters.java
index edec37e..1b0170e 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/PowerSystemResourceTypes_1_ApplicationXml_RequestParameters.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/PowerSystemResourceTypes_1_ApplicationXml_RequestParameters.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.responder.parameters;
 
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/PowerSystemResources_1_ApplicationXml_RequestParameters.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/PowerSystemResources_1_ApplicationXml_RequestParameters.java
index 9f6e64b..e61dac1 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/PowerSystemResources_1_ApplicationXml_RequestParameters.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/PowerSystemResources_1_ApplicationXml_RequestParameters.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.responder.parameters;
 
diff --git a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/Topology_2_ApplicationRdf_RequestParameters.java b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/Topology_2_ApplicationRdf_RequestParameters.java
index 32efdd4..f64c7e4 100644
--- a/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/Topology_2_ApplicationRdf_RequestParameters.java
+++ b/dev/adapter/src/main/java/org/eclipse/openk/domain/dynamictopology/adapter/responder/parameters/Topology_2_ApplicationRdf_RequestParameters.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.adapter.responder.parameters;
 
diff --git a/dev/core/src/main/java/org/eclipse/openk/domain/dynamictopology/core/DynamicTopologyDefaults.java b/dev/core/src/main/java/org/eclipse/openk/domain/dynamictopology/core/DynamicTopologyDefaults.java
index b18a46a..63c9153 100644
--- a/dev/core/src/main/java/org/eclipse/openk/domain/dynamictopology/core/DynamicTopologyDefaults.java
+++ b/dev/core/src/main/java/org/eclipse/openk/domain/dynamictopology/core/DynamicTopologyDefaults.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.core;
 
diff --git a/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/ConnectedConnectingEquipments_Get_Rest_EndPoint.java b/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/ConnectedConnectingEquipments_Get_Rest_EndPoint.java
index fc0fb28..a155831 100644
--- a/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/ConnectedConnectingEquipments_Get_Rest_EndPoint.java
+++ b/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/ConnectedConnectingEquipments_Get_Rest_EndPoint.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.infrastructure.endpoint;
 
diff --git a/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/PowerSystemResourceTypes_Get_Rest_EndPoint.java b/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/PowerSystemResourceTypes_Get_Rest_EndPoint.java
index 2cce29a..ce69164 100644
--- a/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/PowerSystemResourceTypes_Get_Rest_EndPoint.java
+++ b/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/PowerSystemResourceTypes_Get_Rest_EndPoint.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.infrastructure.endpoint;
 
diff --git a/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/PowerSystemResources_Get_Rest_EndPoint.java b/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/PowerSystemResources_Get_Rest_EndPoint.java
index e286d89..9a8bf5a 100644
--- a/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/PowerSystemResources_Get_Rest_EndPoint.java
+++ b/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/PowerSystemResources_Get_Rest_EndPoint.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.infrastructure.endpoint;
 
diff --git a/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/Topology_Get_Rest_EndPoint.java b/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/Topology_Get_Rest_EndPoint.java
index 55c851d..03e4415 100644
--- a/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/Topology_Get_Rest_EndPoint.java
+++ b/dev/infrastructure/src/main/java/org/eclipse/openk/domain/dynamictopology/infrastructure/endpoint/Topology_Get_Rest_EndPoint.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.infrastructure.endpoint;
 
diff --git a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/ConnectedConnectingEquipments_1_View.java b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/ConnectedConnectingEquipments_1_View.java
index 4d9d74d..a585b32 100644
--- a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/ConnectedConnectingEquipments_1_View.java
+++ b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/ConnectedConnectingEquipments_1_View.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.logic.view;
 
diff --git a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/PowerSystemResourceTypes_1_View.java b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/PowerSystemResourceTypes_1_View.java
index 561289e..8452333 100644
--- a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/PowerSystemResourceTypes_1_View.java
+++ b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/PowerSystemResourceTypes_1_View.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.logic.view;
 
diff --git a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/PowerSystemResources_1_View.java b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/PowerSystemResources_1_View.java
index c519648..b8ed5d9 100644
--- a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/PowerSystemResources_1_View.java
+++ b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/PowerSystemResources_1_View.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.logic.view;
 
diff --git a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/Topology_1_View.java b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/Topology_1_View.java
index 36ed951..0d38868 100644
--- a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/Topology_1_View.java
+++ b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/Topology_1_View.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.logic.view;
 
diff --git a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/filter/PowerSystemResourceTypeFilter.java b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/filter/PowerSystemResourceTypeFilter.java
index 9943b2e..1222cc3 100644
--- a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/filter/PowerSystemResourceTypeFilter.java
+++ b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/filter/PowerSystemResourceTypeFilter.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.logic.view.filter;
 
diff --git a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/AbstractDynamicTopologyQueryParameters.java b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/AbstractDynamicTopologyQueryParameters.java
index 24bd092..4f55a34 100644
--- a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/AbstractDynamicTopologyQueryParameters.java
+++ b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/AbstractDynamicTopologyQueryParameters.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.logic.view.parameters;
 
diff --git a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/IConnectedConnectingEquipmentsQueryParameters.java b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/IConnectedConnectingEquipmentsQueryParameters.java
index c282472..27dac4a 100644
--- a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/IConnectedConnectingEquipmentsQueryParameters.java
+++ b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/IConnectedConnectingEquipmentsQueryParameters.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.logic.view.parameters;
 
diff --git a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/PowerSystemResourceTypes_1_QueryParameters.java b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/PowerSystemResourceTypes_1_QueryParameters.java
index c660a44..d3bb4c2 100644
--- a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/PowerSystemResourceTypes_1_QueryParameters.java
+++ b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/PowerSystemResourceTypes_1_QueryParameters.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.logic.view.parameters;
 
diff --git a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/PowerSystemResources_1_QueryParameters.java b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/PowerSystemResources_1_QueryParameters.java
index 2c92be0..2406744 100644
--- a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/PowerSystemResources_1_QueryParameters.java
+++ b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/PowerSystemResources_1_QueryParameters.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.logic.view.parameters;
 
diff --git a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/Topology_1_QueryParameters.java b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/Topology_1_QueryParameters.java
index cc4b526..25db860 100644
--- a/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/Topology_1_QueryParameters.java
+++ b/dev/logic/src/main/java/org/eclipse/openk/domain/dynamictopology/logic/view/parameters/Topology_1_QueryParameters.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.logic.view.parameters;
 
diff --git a/dev/logic/src/test/java/org/eclipse/openk/domain/dynamictopology/logic/view/ConnectedConnectingEquipments_1_ViewTest.java b/dev/logic/src/test/java/org/eclipse/openk/domain/dynamictopology/logic/view/ConnectedConnectingEquipments_1_ViewTest.java
index f195ae2..a4750c7 100644
--- a/dev/logic/src/test/java/org/eclipse/openk/domain/dynamictopology/logic/view/ConnectedConnectingEquipments_1_ViewTest.java
+++ b/dev/logic/src/test/java/org/eclipse/openk/domain/dynamictopology/logic/view/ConnectedConnectingEquipments_1_ViewTest.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.logic.view;
 
diff --git a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/DynamicTopologyService.java b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/DynamicTopologyService.java
index ab14215..53bbd07 100644
--- a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/DynamicTopologyService.java
+++ b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/DynamicTopologyService.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.service;
 
diff --git a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/DeserializerFactory.java b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/DeserializerFactory.java
index 5decd32..2ea0661 100644
--- a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/DeserializerFactory.java
+++ b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/DeserializerFactory.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.service.factories;
 
diff --git a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ImporterFactory.java b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ImporterFactory.java
index acb7ffc..d65fd81 100644
--- a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ImporterFactory.java
+++ b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ImporterFactory.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.service.factories;
 
diff --git a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/MapperFactory.java b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/MapperFactory.java
index 42f33e8..d1e9a7e 100644
--- a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/MapperFactory.java
+++ b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/MapperFactory.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.service.factories;
 
diff --git a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ModifierFactory.java b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ModifierFactory.java
index 1580490..f37bd3c 100644
--- a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ModifierFactory.java
+++ b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ModifierFactory.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.service.factories;
 
diff --git a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ReaderProviderFactory.java b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ReaderProviderFactory.java
index b4c6677..091a5fb 100644
--- a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ReaderProviderFactory.java
+++ b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ReaderProviderFactory.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.service.factories;
 
diff --git a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ReceiverFactory.java b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ReceiverFactory.java
index cf7498a..7203e9c 100644
--- a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ReceiverFactory.java
+++ b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ReceiverFactory.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.service.factories;
 
diff --git a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ResponderFactory.java b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ResponderFactory.java
index 206fca7..de7f6b2 100644
--- a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ResponderFactory.java
+++ b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ResponderFactory.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.service.factories;
 
diff --git a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/SerializerFactory.java b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/SerializerFactory.java
index 13278e2..2825778 100644
--- a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/SerializerFactory.java
+++ b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/SerializerFactory.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.service.factories;
 
diff --git a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/TaskFactory.java b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/TaskFactory.java
index c7fef1a..c36d386 100644
--- a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/TaskFactory.java
+++ b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/TaskFactory.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.service.factories;
 
diff --git a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ViewFactory.java b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ViewFactory.java
index 30d9a32..ea629fa 100644
--- a/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ViewFactory.java
+++ b/dev/service/src/main/java/org/eclipse/openk/domain/dynamictopology/service/factories/ViewFactory.java
@@ -1,16 +1,15 @@
 /*
- *  -----------------------------------------------------------------------------
- *  
- *  Copyright © 2015-2019 PSI AG - http://www.psi.de
- *  
- *  This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  -----------------------------------------------------------------------------
- *  
+ * -----------------------------------------------------------------------------
+ * 
+ * Copyright © 2015-2019 PSI AG - http://www.psi.de
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * -----------------------------------------------------------------------------
  */
 package org.eclipse.openk.domain.dynamictopology.service.factories;