diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties
index d79dff2e059ccc6e55be0d59301b05e586b366a9..2900156b02fbd8ade87dbb4cde8febcb54bada5f 100644
--- a/app/src/main/resources/application.properties
+++ b/app/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-server.port=8081
+server.port=8080
 
 spring.datasource.initialization-mode=always
 spring.datasource.url=jdbc:h2:file:~/H2_flightlog;DB_CLOSE_ON_EXIT=FALSE;IFEXISTS=FALSE;DB_CLOSE_DELAY=-1;
diff --git a/app/src/test/resources/application-inttest.properties b/app/src/test/resources/application-inttest.properties
index e31c51d4b78f3cedb20e2252b97f39b96d4843a3..d6efecda046282b46f4e8fa1f92e6ac9dde71e60 100644
--- a/app/src/test/resources/application-inttest.properties
+++ b/app/src/test/resources/application-inttest.properties
@@ -1,6 +1,6 @@
 # application url for selenium
-server.port=8081
-application.url=http://localhost:8081
+server.port=8080
+application.url=http://localhost:8080
 
 spring.datasource.initialization-mode=always
 spring.datasource.url=jdbc:h2:file:~/H2_flightlog;DB_CLOSE_ON_EXIT=FALSE;IFEXISTS=FALSE;DB_CLOSE_DELAY=-1;MODE=PostgreSQL;
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 079f9154f577492e1aa124d74214ce19d77b8d6c..f3e999b3209e0b864d145f8f694935136f831778 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -1,7 +1,7 @@
 import environment from './environment';
-import {PLATFORM} from 'aurelia-pal';
+import { PLATFORM } from 'aurelia-pal';
 import * as Bluebird from 'bluebird';
-import {HttpClient} from 'aurelia-fetch-client';
+import { HttpClient } from 'aurelia-fetch-client';
 
 
 // remove out if you don't want a Promise polyfill (remove also from webpack.config.js)
@@ -17,24 +17,24 @@ export function configure(aurelia) {
   let http = new HttpClient();
   http.configure(config => {
     config
-    .useStandardConfiguration()
-    .withBaseUrl('http://localhost:8081/')
-    .withDefaults({
-      headers: {
-        'Accept': 'application/json'
-      }
-    })
-    .withInterceptor({
-      request(request) {
-        console.log(`Requesting ${request.method} ${request.url}`);
-        return request;
-      },
-      response(response) {
-        console.log(`Received ${response.status} ${response.url}`);
-        return response;
-      }
-    });
-});
+      .useStandardConfiguration()
+      .withBaseUrl('http://localhost:8080/')
+      .withDefaults({
+        headers: {
+          'Accept': 'application/json'
+        }
+      })
+      .withInterceptor({
+        request(request) {
+          console.log(`Requesting ${request.method} ${request.url}`);
+          return request;
+        },
+        response(response) {
+          console.log(`Received ${response.status} ${response.url}`);
+          return response;
+        }
+      });
+  });
 
   container.registerInstance(HttpClient, http);
 
diff --git a/mvnw b/mvnw
old mode 100644
new mode 100755