Merge branch 'merging'

Dockerfile

 # This Dockerfile encapsulate the MIP portal  backend application for development purposes.
 
-FROM java:8-jre
+FROM maven:3-jdk-8
 
 RUN apt-get update && apt-get install -y wget
 RUN wget https://github.com/jwilder/dockerize/releases/download/v0.2.0/dockerize-linux-amd64-v0.2.0.tar.gz
@@ -14,4 +14,6 @@ EXPOSE 8080
 VOLUME /opt/portal/config/
 VOLUME /opt/portal/lib/
 
+WORKDIR /opt/portal/
+
 CMD ["/usr/local/bin/dockerize", "-wait", "tcp://portaldb:5432", "/opt/portal/mip.sh"]

src/main/resources/static/index.html

@@ -38,7 +38,7 @@
 						self.user = data.userAuthentication.details.displayName;
 						self.email = data.userAuthentication.details.emails[0].value;
 						self.authenticated = true;
-						window.location.href = "/frontend/app/index.html#/home";
+						window.location.href = "http://frontend/#/home";
 					}).error(function() {
 						self.user = "N/A";
 						self.email = "N/A";