Merge branch 'DEVELOP_BE' of ssh://172.18.22.160:29418/Dropwizard/Microservices/mics-home-service into DEVELOP_BE
diff --git a/Dockerfile b/Dockerfile
index 71ae7cf..34312ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,40 +3,51 @@
 MAINTAINER Dimitris
 
 WORKDIR /
-
-
-### HOME SERVICE #### 
-WORKDIR microservices
-RUN git clone http://172.18.22.160:8880/gitblit-1.8.0/r/Dropwizard/Microservices/mics-home-service.git && cd mics-home-service && git checkout DEVELOP_BE 
-
-WORKDIR mics-home-service
-
-RUN rm -f -r ./target/mics-home-service && rm -f -r ./target/mics-home-service.war
-
-
+### PORTAL #### 
+WORKDIR portal
+RUN git clone  http://172.18.22.160:8880/gitblit-1.8.0/r/oK/Portal/Backend.git && cd Backend && git checkout DEVELOP_BE 
+WORKDIR Backend
+RUN rm -f -r ./target/portal && rm -f -r ./target/portal.war
 RUN mvn install -DskipTests
-
-RUN mv ./target/mics-home-service.war /opt/tomcat/webapps/mics-home-service.war
+RUN mv ./target/portal.war /opt/tomcat/webapps/portal.war
 
 WORKDIR /
-
-### DIAGNOSIS APP ####
-WORKDIR microservices
-# use this lnik if no proxy(WLAN) - http://87.128.212.254:8880/gitblit-1.8.0/r/Dropwizard/Microservices/mics-diagnosis-app.git
-RUN git clone http://172.18.22.160:8880/gitblit-1.8.0/r/Dropwizard/Microservices/mics-diagnosis-app.git && cd mics-diagnosis-app && git checkout DEVELOP_FE
-
-WORKDIR mics-diagnosis-app
-
-RUN npm install -g @angular/cli@1.6.1
+### PORTAL FE ####
+WORKDIR portal
+RUN git clone  http://172.18.22.160:8880/gitblit-1.8.0/r/oK/Portal/Frontend.git  && cd Frontend && git checkout DEVELOP_FE
+WORKDIR Frontend
 RUN npm install
 RUN ng build --prod
+RUN mv ./dist/ /opt/tomcat/webapps/Frontend/
 
+WORKDIR /
+### DIAGNOSIS APP ####
+WORKDIR microservices
+RUN git clone http://172.18.22.160:8880/gitblit-1.8.0/r/Dropwizard/Microservices/mics-diagnosis-app.git && cd mics-diagnosis-app && git checkout DEVELOP_FE
+WORKDIR mics-diagnosis-app
+RUN npm install
+RUN ng build --prod
 RUN mv ./dist/ /opt/tomcat/webapps/mics-diagnosis-app/
 
 WORKDIR /
+### HOME SERVICE #### 
+WORKDIR microservices
+RUN git clone http://172.18.22.160:8880/gitblit-1.8.0/r/Dropwizard/Microservices/mics-home-service.git && cd mics-home-service && git checkout DEVELOP_BE 
+WORKDIR mics-home-service
+RUN rm -f -r ./target/mics-home-service && rm -f -r ./target/mics-home-service.war
+RUN mvn install -DskipTests
+RUN mv ./target/mics-home-service.war /opt/tomcat/webapps/mics-home-service.war
 
-### ADD PARAMETER TO TOMCAT CONTEXT ###
-RUN sed -i '/<\/Context>/i  <Parameter name="OK_MICS_HOME_ENVIRONMENT" override="false" value="Docker"/>' /opt/tomcat/conf/context.xml 
+WORKDIR /
+### PLGM FRONTEND ####
+WORKDIR gridmeasures
+RUN git clone http://172.18.22.160:8880/gitblit-1.8.0/r/oK/PlannedGridMeasures/Frontend.git   && cd Frontend && git checkout DEVELOP_FE
+WORKDIR Frontend
+RUN npm install
+RUN ng build --prod
+RUN mv ./dist/ /opt/tomcat/webapps/GridMeasuresFrontend/
+
+WORKDIR /
 
 CMD ["/opt/tomcat/bin/catalina.sh", "run"]
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 652f422..e68728c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@
     stage('Build image') {
         /* This builds the actual image; synonymous to
          * docker build on the command line */
-		sh 'docker build --no-cache -t myserver_home:jenkinsversion .'
+		sh 'docker build --no-cache --rm -t myserver_home:jenkinsversion .'
     }
 	
 	stage('Refresh containers') {
diff --git a/pom.xml b/pom.xml
index 636c0b3..e2213b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,8 +268,12 @@
                     <apiSources>
                         <apiSource>
                             <springmvc>false</springmvc>
-                            <locations>org.eclipse.openk.mics.home</locations>
-                            <schemes>http</schemes>
+                            <locations>
+                                <location>org.eclipse.openk.mics.home</location>
+                            </locations>
+                            <schemes>
+                                <shema>http</shema>
+                            </schemes>
                             <host>localhost:8080</host>
                             <basePath>/mics/home</basePath>
                             <info>
diff --git a/src/main/asciidoc/architectureDocumentation/mics.home_architectureDocumentation.adoc b/src/main/asciidoc/architectureDocumentation/mics.home_architectureDocumentation.adoc
index e3bb1b6..351776d 100644
--- a/src/main/asciidoc/architectureDocumentation/mics.home_architectureDocumentation.adoc
+++ b/src/main/asciidoc/architectureDocumentation/mics.home_architectureDocumentation.adoc
@@ -1,4 +1,15 @@
-openKonsequenz - Architecture of the module "mics.home@openK"
+////
+******************************************************************************
+* Copyright © 2018 PTA GmbH.
+* 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
+*
+******************************************************************************
+////
+openKonsequenz - Architecture of the module "mics.home@openK"
 ============================================================
 :Author: Frank Dietrich
 :Email: frank.dietrich@pta.de
diff --git a/src/main/asciidoc/howto/mics.home_howtoBuild.adoc b/src/main/asciidoc/howto/mics.home_howtoBuild.adoc
index 78b8af5..593a91d 100644
--- a/src/main/asciidoc/howto/mics.home_howtoBuild.adoc
+++ b/src/main/asciidoc/howto/mics.home_howtoBuild.adoc
@@ -1,3 +1,14 @@
+////
+******************************************************************************
+* Copyright © 2018 PTA GmbH.
+* 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
+*
+******************************************************************************
+////
 = openKonsequenz - How to build the module "mics.home@openK"
 :Date: 2017-11-17
 :Revision: 1
diff --git a/src/main/asciidoc/howto/mics.home_howtoRun.adoc b/src/main/asciidoc/howto/mics.home_howtoRun.adoc
index 808f24b..a18cd49 100644
--- a/src/main/asciidoc/howto/mics.home_howtoRun.adoc
+++ b/src/main/asciidoc/howto/mics.home_howtoRun.adoc
@@ -1,3 +1,14 @@
+////
+******************************************************************************
+* Copyright © 2018 PTA GmbH.
+* 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
+*
+******************************************************************************
+////
 = openKonsequenz - How to run the module "mics.home@openK"
 :Date: 2017-11-17
 :Revision: 1
diff --git a/src/main/asciidoc/interfaceDocumentation/elogbook_interfaceDocumentation.adoc b/src/main/asciidoc/interfaceDocumentation/elogbook_interfaceDocumentation.adoc
index 7d4252d..e0913bc 100644
--- a/src/main/asciidoc/interfaceDocumentation/elogbook_interfaceDocumentation.adoc
+++ b/src/main/asciidoc/interfaceDocumentation/elogbook_interfaceDocumentation.adoc
@@ -1,4 +1,15 @@
-eLogbook@openK - Backend REST-Service documentation
+////
+******************************************************************************
+* Copyright © 2018 PTA GmbH.
+* 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
+*
+******************************************************************************
+////
+eLogbook@openK - Backend REST-Service documentation
 ===================================================
 :Author: Frank Dietrich
 :Email: frank.dietrich@pta.de