Merge branch 'master' into fixGitlabCI

# Conflicts:
#	pom.xml

.gitlab-ci.yml

 image: maven:3-jdk-8
 
-stages:
-  - test
-  - deploy
 
-test:
-  stage: test
-  script: "mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml"
-
-deploy:
-  stage: deploy
-  script: "mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B deploy --settings settings.xml"
+masterJob:
+  script: "mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install deploy --settings settings.xml"
   only:
+  - master
+  
+BranchJob:
+  script: "mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml"
+  except:
   - master
\ No newline at end of file

settings.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-
-     ******************************************************************************
-     MontiCAR Modeling Family, www.se-rwth.de
-     Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
-     All rights reserved.
-
-     This project is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 3.0 of the License, or (at your option) any later version.
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this project. If not, see <http://www.gnu.org/licenses/>.
-    *******************************************************************************
-
--->
 
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"