diff --git a/.gitignore b/.gitignore
index dfdbf7632..6aab11c55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,19 @@
 dmp-frontend/dist.7z
 .idea/
 *.iml
+dmp-backend/src/main/ui-resources/static/vendor.bundle.js.map
+dmp-backend/src/main/ui-resources/static/vendor.bundle.js
+dmp-backend/src/main/ui-resources/static/unauthorized.module.chunk.js.map
+dmp-backend/src/main/ui-resources/static/unauthorized.module.chunk.js
+dmp-backend/src/main/ui-resources/static/styles.bundle.js.map
+dmp-backend/src/main/ui-resources/static/styles.bundle.js
+dmp-backend/src/main/ui-resources/static/polyfills.bundle.js.map
+dmp-backend/src/main/ui-resources/static/polyfills.bundle.js
+dmp-backend/src/main/ui-resources/static/main.bundle.js.map
+dmp-backend/src/main/ui-resources/static/main.bundle.js
+dmp-backend/src/main/ui-resources/static/lang/en.json
+dmp-backend/src/main/ui-resources/static/inline.bundle.js.map
+dmp-backend/src/main/ui-resources/static/inline.bundle.js
+dmp-backend/src/main/ui-resources/static/index.html
+dmp-backend/src/main/ui-resources/static/favicon.ico
+dmp-backend/src/main/ui-resources/static/assets/lang/en.json
diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index 9469010e8..27faf1f1c 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -5,8 +5,7 @@
     <groupId>dmp-backend</groupId>
     <artifactId>dmp-backend</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-
-
+    <packaging>war</packaging>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -41,12 +40,11 @@
 
     <dependencies>
 
-        <!-- 		<dependency> -->
-        <!-- 			<groupId>dmp-backend</groupId> -->
-        <!-- 			<artifactId>dmp-backend-commons</artifactId> -->
-        <!-- 			<version>${dmp-backend-commons.version}</version> -->
-        <!-- 		</dependency> -->
-        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
         <!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
@@ -205,6 +203,15 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/ui-resources</directory>
+                <excludes>
+                    <exclude>node_modules/**</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
         <plugins>
 
             <plugin>
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/AngularController.java b/dmp-backend/src/main/java/eu/eudat/controllers/AngularController.java
new file mode 100644
index 000000000..3966e04de
--- /dev/null
+++ b/dmp-backend/src/main/java/eu/eudat/controllers/AngularController.java
@@ -0,0 +1,15 @@
+package eu.eudat.controllers;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * Created by ikalyvas on 1/12/2018.
+ */
+@Controller
+public class AngularController {
+    @RequestMapping({ "/login/twitter", "/login/linkedin"})
+    public String index() {
+        return "forward:/index.html";
+    }
+}
diff --git a/dmp-backend/src/main/resources/application.properties b/dmp-backend/src/main/resources/application.properties
new file mode 100644
index 000000000..ebca4274c
--- /dev/null
+++ b/dmp-backend/src/main/resources/application.properties
@@ -0,0 +1,71 @@
+##########################Security##########################################
+#eu.eudat.security.portmapping.http = 7081
+#eu.eudat.security.portmapping.https = 7444
+########################/Security########################################
+server.port = 8080
+
+##########################Persistence##########################################
+database.driver-class-name=org.postgresql.Driver
+database.url = jdbc:postgresql://develdb1.madgik.di.uoa.gr:5432/dmptool
+database.username = dmptool
+database.password = dmpt00lu$r
+##########################/Persistence##########################################
+
+###################Allowed Proxy Service Host ############################
+eu.eudat.proxy.allowed.host = https://eestore.paas2.uninett.no
+configuration.externalUrls = file:///C:\\Users\\ikalyvas\\Documents\\Projects\\OpenAIRE-EUDAT-DMP-service-pilot\\dmp-backend\\src\\main\\resources\\ExternalUrls.xml
+#######################################################
+
+########################/Email#############################
+spring.mail.default-encoding=UTF-8
+spring.mail.host=smtp.gmail.com
+spring.mail.username=kalivasioan@gmail.com
+spring.mail.password=A3b*1*92giannis
+spring.mail.port=587
+spring.mail.protocol=smtp
+spring.mail.test-connection=false
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+mail.subject = Invitation to DMP Plan {dmpname}
+mail.content = You have been invited to {dmpname} data management plan.Follow the link localhost:4200/invitation/{invitationID} to submit it
+mail.from = citesagrdev@gmail.com
+
+########################FACEBOOK LOGIN Properties#############################
+facebook.login.clientId = 110586756143149
+facebook.login.clientSecret = 522a847f05c873d0222c85109e24f55a
+facebook.login.namespace = eudat
+########################GOOGLE LOGIN Properties#############################
+google.login.clientId = 524432312250-sc9qsmtmbvlv05r44onl6l93ia3k9deo.apps.googleusercontent.com
+########################LINKEDIN LOGIN Properties#############################HiR4hQH9HNubKC5iKQy0l4mAZ
+linkedin.login.clientId = 86bl8vfk77clh9
+linkedin.login.clientSecret = 2OCO9e3wKylW05Tt
+linkedin.login.redirect_uri = http://localhost:4200/login/linkedin
+
+########################LINKEDIN LOGIN Properties#############################
+twitter.login.clientId = HiR4hQH9HNubKC5iKQy0l4mAZ
+twitter.login.clientSecret = 9KZHgkqUO2QFnELSL14jeUvfUacWX23rqD8OW8X0xoRDXOSfKH
+twitter.login.redirect_uri = http://localhost:4200/login/twitter
+########################Persistence/Hibernate/Batch##############################
+#persistence.hibernate.jdbc.batch_size = 30
+#persistence.hibernate.order_inserts = true
+#persistence.hibernate.order_updates = true
+#persistence.hibernate.batch_versioned_data = true
+#persistence.hibernate.jdbc.batch_versioned_data = DELAYED_ACQUISITION_AND_RELEASE_AFTER_TRANSACTION
+########################Persistence/Hibernate/Batch##############################
+
+
+########################Persistence/Hibernate/Connection pool####################
+#persistence.hibernate.connectionpool.provider_class = org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider
+#persistence.hibernate.connectionpool.c3p0.min_size = 5
+#persistence.hibernate.connectionpool.c3p0.max_size = 100
+#persistence.hibernate.connectionpool.c3p0.timeout = 0
+#persistence.hibernate.connectionpool.c3p0.max_statements = 50
+#persistence.hibernate.connectionpool.c3p0.acquire_retry_attempts = 30
+#persistence.hibernate.connectionpool.c3p0.acquire_retry_delay = 1000
+#persistence.hibernate.connectionpool.c3p0.idle_test_period = 3000
+#persistence.hibernate.connectionpool.c3p0.break_after_acquire_failure = false
+#persistence.hibernate.connectionpool.c3p0.idle_connection_test_period = 3600
+#persistence.hibernate.connectionpool.c3p0.test_connection_on_checkin = true
+#persistence.hibernate.connectionpool.c3p0.test_connection_on_checkout = false
+#persistence.hibernate.connectionpool.c3p0.preferred_test_query = select 1
+########################Persistence/Hibernate/Connection pool####################
\ No newline at end of file
diff --git a/dmp-frontend/src/app/app.constants.ts b/dmp-frontend/src/app/app.constants.ts
index d599ff1c5..0392c05a9 100644
--- a/dmp-frontend/src/app/app.constants.ts
+++ b/dmp-frontend/src/app/app.constants.ts
@@ -1,5 +1,5 @@
 export const HostConfiguration = {
-	Server: 'http://192.168.32.96:8080/',
+	Server: 'http://localhost:4200/',
 	App: 'http://localhost:4200/'
 	//CASHost: 'https://login-devel.uoa.gr/login',
 	//Service: 'http://elkefinman/login'