catch up with development
diff --git a/org.eclipse.osbp.dsl.common.xtext/src-gen/org/eclipse/osbp/dsl/common/xtext/parser/antlr/internal/InternalCommonGrammarLexer.java b/org.eclipse.osbp.dsl.common.xtext/src-gen/org/eclipse/osbp/dsl/common/xtext/parser/antlr/internal/InternalCommonGrammarLexer.java
index 5ac14ec..5bfeb3d 100644
--- a/org.eclipse.osbp.dsl.common.xtext/src-gen/org/eclipse/osbp/dsl/common/xtext/parser/antlr/internal/InternalCommonGrammarLexer.java
+++ b/org.eclipse.osbp.dsl.common.xtext/src-gen/org/eclipse/osbp/dsl/common/xtext/parser/antlr/internal/InternalCommonGrammarLexer.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.common.xtext.parser.antlr.internal;
 
 // Hack: Use our own Lexer superclass by means of import. 
@@ -5499,4 +5489,4 @@
     }
  
 
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.osbp.dsl.datatype.xtext/src-gen/org/eclipse/osbp/dsl/datatype/xtext/parser/antlr/internal/InternalDatatypeGrammarLexer.java b/org.eclipse.osbp.dsl.datatype.xtext/src-gen/org/eclipse/osbp/dsl/datatype/xtext/parser/antlr/internal/InternalDatatypeGrammarLexer.java
index ea5242a..7a6e17f 100644
--- a/org.eclipse.osbp.dsl.datatype.xtext/src-gen/org/eclipse/osbp/dsl/datatype/xtext/parser/antlr/internal/InternalDatatypeGrammarLexer.java
+++ b/org.eclipse.osbp.dsl.datatype.xtext/src-gen/org/eclipse/osbp/dsl/datatype/xtext/parser/antlr/internal/InternalDatatypeGrammarLexer.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.datatype.xtext.parser.antlr.internal;
 
 // Hack: Use our own Lexer superclass by means of import. 
@@ -5499,4 +5489,4 @@
     }
  
 
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.osbp.dsl.dto.xtext/src-gen/org/eclipse/osbp/dsl/dto/xtext/parser/antlr/internal/InternalDtoGrammarLexer.java b/org.eclipse.osbp.dsl.dto.xtext/src-gen/org/eclipse/osbp/dsl/dto/xtext/parser/antlr/internal/InternalDtoGrammarLexer.java
index 8068ba1..975a6f2 100644
--- a/org.eclipse.osbp.dsl.dto.xtext/src-gen/org/eclipse/osbp/dsl/dto/xtext/parser/antlr/internal/InternalDtoGrammarLexer.java
+++ b/org.eclipse.osbp.dsl.dto.xtext/src-gen/org/eclipse/osbp/dsl/dto/xtext/parser/antlr/internal/InternalDtoGrammarLexer.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.dto.xtext.parser.antlr.internal;
 
 // Hack: Use our own Lexer superclass by means of import. 
@@ -5894,4 +5884,4 @@
     }
  
 
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.osbp.dsl.entity.xtext/src-gen/org/eclipse/osbp/dsl/entity/xtext/parser/antlr/internal/InternalEntityGrammarLexer.java b/org.eclipse.osbp.dsl.entity.xtext/src-gen/org/eclipse/osbp/dsl/entity/xtext/parser/antlr/internal/InternalEntityGrammarLexer.java
index 5f32bbf..4a1706c 100644
--- a/org.eclipse.osbp.dsl.entity.xtext/src-gen/org/eclipse/osbp/dsl/entity/xtext/parser/antlr/internal/InternalEntityGrammarLexer.java
+++ b/org.eclipse.osbp.dsl.entity.xtext/src-gen/org/eclipse/osbp/dsl/entity/xtext/parser/antlr/internal/InternalEntityGrammarLexer.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.entity.xtext.parser.antlr.internal;
 
 // Hack: Use our own Lexer superclass by means of import. 
@@ -6819,4 +6809,4 @@
     }
  
 
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.osbp.dsl.services.xtext/src-gen/org/eclipse/osbp/dsl/services/xtext/parser/antlr/internal/InternalServicesGrammarLexer.java b/org.eclipse.osbp.dsl.services.xtext/src-gen/org/eclipse/osbp/dsl/services/xtext/parser/antlr/internal/InternalServicesGrammarLexer.java
index ad118f8..150b395 100644
--- a/org.eclipse.osbp.dsl.services.xtext/src-gen/org/eclipse/osbp/dsl/services/xtext/parser/antlr/internal/InternalServicesGrammarLexer.java
+++ b/org.eclipse.osbp.dsl.services.xtext/src-gen/org/eclipse/osbp/dsl/services/xtext/parser/antlr/internal/InternalServicesGrammarLexer.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.services.xtext.parser.antlr.internal;
 
 // Hack: Use our own Lexer superclass by means of import. 
@@ -5882,4 +5872,4 @@
     }
  
 
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/ToCycle1Dto.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/ToCycle1Dto.java
index 1d59358..917dbbd 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/ToCycle1Dto.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/ToCycle1Dto.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.dtos;
 
 import java.beans.PropertyChangeListener;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/ToCycle2Dto.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/ToCycle2Dto.java
index 20f3e2e..5cf9171 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/ToCycle2Dto.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/ToCycle2Dto.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.dtos;
 
 import java.beans.PropertyChangeListener;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/mapper/ToCycle1DtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/mapper/ToCycle1DtoMapper.java
index 886b1cf..f7d9ab9 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/mapper/ToCycle1DtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/mapper/ToCycle1DtoMapper.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.dtos.mapper;
 
 import java.util.List;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/mapper/ToCycle2DtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/mapper/ToCycle2DtoMapper.java
index c7c6f93..735e292 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/mapper/ToCycle2DtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/mapper/ToCycle2DtoMapper.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.dtos.mapper;
 
 import org.eclipse.osbp.dsl.dto.lib.MappingContext;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/AddonDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/AddonDtoService.java
index b776c5c..ed54eb8 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/AddonDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/AddonDtoService.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.dtos.services;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/CarDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/CarDtoService.java
index 659e038..9d05d4e 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/CarDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/CarDtoService.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.dtos.services;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/PersonDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/PersonDtoService.java
index 6348c09..46e9c6e 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/PersonDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/PersonDtoService.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.dtos.services;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/ToCycle1DtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/ToCycle1DtoService.java
index 1e1024c..dff7a14 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/ToCycle1DtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/ToCycle1DtoService.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.dtos.services;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/ToCycle2DtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/ToCycle2DtoService.java
index 27c2603..3415ffd 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/ToCycle2DtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/dtos/services/ToCycle2DtoService.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.dtos.services;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Addon.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Addon.java
index 4c89b74..32b3b9a 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Addon.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Addon.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.entities;
 
 import javax.persistence.CascadeType;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Address.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Address.java
index af70f2e..4580364 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Address.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Address.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.entities;
 
 import java.io.Serializable;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Base.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Base.java
index 642de5d..22130db 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Base.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Base.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.entities;
 
 import javax.persistence.Id;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Car.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Car.java
index e60b0f8..39d6309 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Car.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Car.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.entities;
 
 import java.util.ArrayList;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Person.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Person.java
index 123da7e..983bcf9 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Person.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/Person.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.entities;
 
 import java.util.ArrayList;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/ToCycle1.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/ToCycle1.java
index 983e4c3..fe73d4a 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/ToCycle1.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/ToCycle1.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.entities;
 
 import java.util.ArrayList;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/ToCycle2.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/ToCycle2.java
index 4eb0aa4..3f4a516 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/ToCycle2.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/eclipse/osbp/dsl/tests/carstore/entities/ToCycle2.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.eclipse.osbp.dsl.tests.carstore.entities;
 
 import javax.persistence.CascadeType;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/AddressDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/AddressDtoMapper.java
index 716b7e8..feb6021 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/AddressDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/AddressDtoMapper.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.osbp.mysmartshop.dtos.mapper;
 
 import org.eclipse.osbp.dsl.dto.lib.MappingContext;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashPaymentDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashPaymentDtoMapper.java
index 5b91bee..549f13a 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashPaymentDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashPaymentDtoMapper.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.osbp.mysmartshop.dtos.mapper;
 
 import java.util.Date;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashPaymentMethodDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashPaymentMethodDtoMapper.java
index 76910ab..2f83ef9 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashPaymentMethodDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashPaymentMethodDtoMapper.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.osbp.mysmartshop.dtos.mapper;
 
 import java.util.List;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashRegisterDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashRegisterDtoMapper.java
index 8577e91..e1892f4 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashRegisterDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashRegisterDtoMapper.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.osbp.mysmartshop.dtos.mapper;
 
 import java.util.List;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashSlipDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashSlipDtoMapper.java
index dcf722f..5a728a8 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashSlipDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CashSlipDtoMapper.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.osbp.mysmartshop.dtos.mapper;
 
 import java.util.Date;
@@ -27,13 +17,6 @@
 
 /**
  * This class maps the dto {@link CashSlipDto} to and from the entity {@link CashSlip}.
-  * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
  * 
  */
 @SuppressWarnings("all")
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CompanyDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CompanyDtoMapper.java
index a2c4041..3792959 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CompanyDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CompanyDtoMapper.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.osbp.mysmartshop.dtos.mapper;
 
 import java.util.List;
@@ -26,13 +16,6 @@
 
 /**
  * This class maps the dto {@link CompanyDto} to and from the entity {@link Company}.
-  * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
  * 
  */
 @SuppressWarnings("all")
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CompanyRelationTypeDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CompanyRelationTypeDtoMapper.java
index 57a0c78..8608d7c 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CompanyRelationTypeDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/CompanyRelationTypeDtoMapper.java
@@ -1,13 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
 package org.osbp.mysmartshop.dtos.mapper;
 
 import org.eclipse.osbp.dsl.dto.lib.MappingContext;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DepartmentDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DepartmentDtoMapper.java
index 72421dd..3f61ca1 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DepartmentDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DepartmentDtoMapper.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.mapper;
 
 import java.util.List;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestBeanDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestBeanDtoMapper.java
index 0d5a44d..f2a124e 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestBeanDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestBeanDtoMapper.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.mapper;
 
 import org.eclipse.osbp.dsl.dto.lib.IMapper;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestChildContainmentDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestChildContainmentDtoMapper.java
index 829c268..39236f8 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestChildContainmentDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestChildContainmentDtoMapper.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.mapper;
 
 import org.eclipse.osbp.dsl.dto.lib.MappingContext;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestChildCrossRefDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestChildCrossRefDtoMapper.java
index 6836ac6..bcf9f4c 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestChildCrossRefDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestChildCrossRefDtoMapper.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.mapper;
 
 import org.eclipse.osbp.dsl.dto.lib.MappingContext;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestParentDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestParentDtoMapper.java
index 4f01aca..b1aabe9 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestParentDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/DtoTestParentDtoMapper.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.mapper;
 
 import java.util.List;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/McustomerDtoMapper.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/McustomerDtoMapper.java
index f13458d..ba1615c 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/McustomerDtoMapper.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/mapper/McustomerDtoMapper.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.mapper;
 
 import java.util.Date;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/AddressDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/AddressDtoService.java
index 36edcfc..f5b8ceb 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/AddressDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/AddressDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashPaymentDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashPaymentDtoService.java
index 22248ea..7facc6f 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashPaymentDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashPaymentDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashPaymentMethodDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashPaymentMethodDtoService.java
index 5929a64..1745932 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashPaymentMethodDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashPaymentMethodDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashRegisterDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashRegisterDtoService.java
index 1395352..4844078 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashRegisterDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CashRegisterDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyDtoService.java
index 2235f7c..606d032 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyGroupDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyGroupDtoService.java
index c4787e6..2b15aa4 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyGroupDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyGroupDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyRelationTypeDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyRelationTypeDtoService.java
index ddcaaf2..b3c1590 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyRelationTypeDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/CompanyRelationTypeDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DepartmentDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DepartmentDtoService.java
index 3028e02..bf3e2be 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DepartmentDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DepartmentDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestChildContainmentDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestChildContainmentDtoService.java
index 16aa53e..6fa8d2e 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestChildContainmentDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestChildContainmentDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestChildCrossRefDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestChildCrossRefDtoService.java
index badeacb..5115a24 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestChildCrossRefDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestChildCrossRefDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestParentDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestParentDtoService.java
index c155f0a..d8a1997 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestParentDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/DtoTestParentDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/McustomerDtoService.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/McustomerDtoService.java
index 9140f31..6e77f03 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/McustomerDtoService.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/dtos/service/McustomerDtoService.java
@@ -1,14 +1,3 @@
-/**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
- */
-
 package org.osbp.mysmartshop.dtos.service;
 
 import org.eclipse.osbp.dsl.dto.lib.services.impl.AbstractDTOService;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/Address.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/Address.java
index 160714c..a89e662 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/Address.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/Address.java
@@ -1,14 +1,17 @@
 /**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
+ * Copyright (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ *  This source was created by OSBP Softwarefactory Wizard!
+ * 
+ *  OSBP is (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ * ================================================================
+ * 
+ *  @file           $HeadURL$
+ *  @version        $Revision$
+ *  @date           $Date$
+ *  @author         $Author$
  */
-
 package org.osbp.mysmartshop.entities;
 
 import javax.persistence.CascadeType;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/CompanyGroup.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/CompanyGroup.java
index 8c01e91..0c16881 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/CompanyGroup.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/CompanyGroup.java
@@ -1,14 +1,17 @@
 /**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
+ * Copyright (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ *  This source was created by OSBP Softwarefactory Wizard!
+ * 
+ *  OSBP is (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ * ================================================================
+ * 
+ *  @file           $HeadURL$
+ *  @version        $Revision$
+ *  @date           $Date$
+ *  @author         $Author$
  */
-
 package org.osbp.mysmartshop.entities;
 
 import java.util.ArrayList;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/CompanyRelationType.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/CompanyRelationType.java
index 09f5eee..779d778 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/CompanyRelationType.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/CompanyRelationType.java
@@ -1,14 +1,17 @@
 /**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
+ * Copyright (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ *  This source was created by OSBP Softwarefactory Wizard!
+ * 
+ *  OSBP is (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ * ================================================================
+ * 
+ *  @file           $HeadURL$
+ *  @version        $Revision$
+ *  @date           $Date$
+ *  @author         $Author$
  */
-
 package org.osbp.mysmartshop.entities;
 
 import javax.persistence.Column;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/DtoTestChildContainment.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/DtoTestChildContainment.java
index 1878f5c..6e05a79 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/DtoTestChildContainment.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/DtoTestChildContainment.java
@@ -1,14 +1,17 @@
 /**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
+ * Copyright (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ *  This source was created by OSBP Softwarefactory Wizard!
+ * 
+ *  OSBP is (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ * ================================================================
+ * 
+ *  @file           $HeadURL$
+ *  @version        $Revision$
+ *  @date           $Date$
+ *  @author         $Author$
  */
-
 package org.osbp.mysmartshop.entities;
 
 import javax.persistence.CascadeType;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/DtoTestChildCrossRef.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/DtoTestChildCrossRef.java
index 8daf2ae..1d82b98 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/DtoTestChildCrossRef.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/DtoTestChildCrossRef.java
@@ -1,14 +1,17 @@
 /**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
+ * Copyright (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ *  This source was created by OSBP Softwarefactory Wizard!
+ * 
+ *  OSBP is (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ * ================================================================
+ * 
+ *  @file           $HeadURL$
+ *  @version        $Revision$
+ *  @date           $Date$
+ *  @author         $Author$
  */
-
 package org.osbp.mysmartshop.entities;
 
 import javax.persistence.Entity;
diff --git a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/Mcustomer.java b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/Mcustomer.java
index eec6ea3..76fb710 100644
--- a/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/Mcustomer.java
+++ b/org.eclipse.osbp.dsl.tests.model/src-gen/org/osbp/mysmartshop/entities/Mcustomer.java
@@ -1,14 +1,17 @@
 /**
- * Copyright (c) 2011, 2015 - Lunifera GmbH (Gross Enzersdorf), Loetz GmbH&Co.KG (Heidelberg)
- * All rights reserved. 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
- *
- * Contributors:
- *         Florian Pirchner - Initial implementation
+ * Copyright (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ *  This source was created by OSBP Softwarefactory Wizard!
+ * 
+ *  OSBP is (C) - Loetz GmbH&Co.KG, 69115 Heidelberg, Germany
+ * 
+ * ================================================================
+ * 
+ *  @file           $HeadURL$
+ *  @version        $Revision$
+ *  @date           $Date$
+ *  @author         $Author$
  */
-
 package org.osbp.mysmartshop.entities;
 
 import java.util.ArrayList;