diff --git a/cocome-maven-project/doc/Deployment Setup.md b/cocome-maven-project/doc/Deployment Setup.md
index 65e516f4..1158bcfa 100644
--- a/cocome-maven-project/doc/Deployment Setup.md	
+++ b/cocome-maven-project/doc/Deployment Setup.md	
@@ -14,14 +14,15 @@ multiple domains with server, all deployable containers can be put on
 one server each in its own domain. However in this document, we use
 five different nodes with one Glassfish server.
 
-For each part, the following parameters are relevant and are set in the settings.xml
+For each part, the following parameters are relevant and are set in the **settings.xml**
 for `cocome-maven-project` and `cocome-cloud-jee-service-adapter`:
-- ip address (and hostname)
-- http port (port used by the services in a deployment)
-- admin port (port used by the admin console)
-- domain (Glassfish domain)
-- admin user name (name of the admin user)
-- admin password (password of the admin user)
+
+* host (usually "localhost", can be ip adress when you deployed parts of cocome on a different machine)
+* http port (port used by the services in a deployment; portbase + 80)
+* admin port (port used by the admin console; portbase + 48)
+* domain (Glassfish domain, ex.:  registry)
+* admin user name (name of the admin user; usually: admin)
+* admin password (password of the admin user; usually no password )
 
 ## Important notice
 - In each case you need to start the glassfish domains before you can actually deploy 
@@ -33,20 +34,21 @@ for `cocome-maven-project` and `cocome-cloud-jee-service-adapter`:
 ## Maven based Deployment
 
 As the deployment is now performed with the cargo maven plug-in, the
-specification of a password file is no longer an option and a local
-Glassfish installation is not necessary. Instead the password field in the 
+specification of a password file is no longer an option. Instead the password field in the 
 settings.xml can be left empty.
 
-You can either deploy all parts of CoCoME in one go, or each part separately.
+You can either deploy all parts of CoCoME in one go(which is recommended!), or each part separately.
 To deploy CoCoME as a whole, execute the following commands in the `cocome-maven-project` folder.
 
 To deploy one of the sub-projects, execute the commands in its corresponding folder: 
+
  - `cloud-web-frontend` for the frontend part
  - `enterprise-logic-ear`, `store-logic-ear` for the enterprise and store logic parts 
  - `cloud-registry-service` for the registry.
 
 ### Command Line Deployment
 On command line you may deploy CoCoME or one of the above sub-projects as follows:
+
 - Enter the project folder to deploy CoCoME and run
   `mvn -s settings.xml install`
   
@@ -55,6 +57,7 @@ On command line you may deploy CoCoME or one of the above sub-projects as follow
    
 ### Eclipse Deployment
 To deploy CoCoME or one of the above sub-projects from within Eclipse, do the following:
+
 - Right-click on cocome-maven-project -> Run As -> Build...
 - Set the following values:
  - Goals: install
@@ -62,6 +65,7 @@ To deploy CoCoME or one of the above sub-projects from within Eclipse, do the fo
  - User Settings:  Use your settings.xml from the actual project
  
 To undeploy CoCoME or a sub-project:
+
 - Right-click on cocome-maven-project -> Run As -> Build...
 - Set the following values:
  - Goals: clean post-clean
diff --git a/cocome-maven-project/doc/Development Setup.md b/cocome-maven-project/doc/Development Setup.md
index 3aee1e68..fb97f15c 100644
--- a/cocome-maven-project/doc/Development Setup.md	
+++ b/cocome-maven-project/doc/Development Setup.md	
@@ -61,13 +61,14 @@
   domains or you have configured you Glassfish servers with different
   admin and http ports, then you have to set these values properly.
   
-- In the `service-adapter` project, proceed in a similar way (You should to add a Glassfish domain for this one). Therefore
+- In the `service-adapter` project, proceed in a similar way (You should have added a Glassfish domain for this one too). Therefore
   read the [README](https://github.com/cocome-community-case-study/cocome-cloud-jee-service-adapter) in the cocome-cloud-jee-service-adapter project.
-<<<<<<< 0af5575f29912bbf758ba19a66bf9dadc3104756
+
+
 - Make sure you refer to the same domain for `service adapter` in this setting file and in the setting file of the service-adapter.  
-=======
+
   Notice: the domain 'adapter' you propably created during glassfish setup is supposed to be the domain for the service-adapter project.
->>>>>>> 5fc8f1dce60fadb70749b4fc50e5265114c9bf84
+
   
 ## Building CoCoME
  
diff --git a/cocome-maven-project/settings.xml.template b/cocome-maven-project/settings.xml.template
index ca6bd4d9..866ed32e 100644
--- a/cocome-maven-project/settings.xml.template
+++ b/cocome-maven-project/settings.xml.template
@@ -9,53 +9,53 @@
 			<properties>
 				<!-- registry node deployment configuration -->
 				<logic.registry.protocol>http</logic.registry.protocol>
-				<logic.registry.domain>cocome</logic.registry.domain>
-				<logic.registry.host>192.168.48.236</logic.registry.host>
-				<logic.registry.httpPort>8080</logic.registry.httpPort>
-				<logic.registry.adminPort>4848</logic.registry.adminPort>
+				<logic.registry.domain>registry</logic.registry.domain>
+				<logic.registry.host>localhost</logic.registry.host>
+				<logic.registry.httpPort>8480</logic.registry.httpPort>
+				<logic.registry.adminPort>8448</logic.registry.adminPort>
 				<logic.registry.user>admin</logic.registry.user>
-				<logic.registry.password>admin</logic.registry.password>
+				<logic.registry.password></logic.registry.password>
 				<logic.registry.baseDir />
 				
 				<logic.registry.stubs.package>org.cocome.cloud.logic.registry.stub</logic.registry.stubs.package>
-		
+				
 				<!-- store node deployment configuration -->
 				<logic.store.protocol>http</logic.store.protocol>
-				<logic.store.domain>cocome</logic.store.domain>
-				<logic.store.host>192.168.48.236</logic.store.host>
-				<logic.store.httpPort>8080</logic.store.httpPort>
-				<logic.store.adminPort>4848</logic.store.adminPort>
+				<logic.store.domain>store</logic.store.domain>
+				<logic.store.host>localhost</logic.store.host>
+				<logic.store.httpPort>8180</logic.store.httpPort>
+				<logic.store.adminPort>8148</logic.store.adminPort>
 				<logic.store.user>admin</logic.store.user>
-				<logic.store.password>admin</logic.store.password>
+				<logic.store.password></logic.store.password>
 				<logic.store.baseDir />
 				
 				<logic.stubs.package>org.cocome.cloud.logic.stub</logic.stubs.package>
 		
 				<!--  enterprise node deployment configuration -->
 				<logic.enterprise.protocol>http</logic.enterprise.protocol>
-				<logic.enterprise.domain>cocome</logic.enterprise.domain>
-				<logic.enterprise.host>192.168.48.232</logic.enterprise.host>
-				<logic.enterprise.httpPort>8080</logic.enterprise.httpPort>
-				<logic.enterprise.adminPort>4848</logic.enterprise.adminPort>
+				<logic.enterprise.domain>enterprise</logic.enterprise.domain>
+				<logic.enterprise.host>localhost</logic.enterprise.host>
+				<logic.enterprise.httpPort>8380</logic.enterprise.httpPort>
+				<logic.enterprise.adminPort>8348</logic.enterprise.adminPort>
 				<logic.enterprise.user>admin</logic.enterprise.user>
-				<logic.enterprise.password>admin</logic.enterprise.password>
+				<logic.enterprise.password></logic.enterprise.password>
 				<logic.enterprise.baseDir />
 		
 				<!-- web node deployment configuration -->	
-				<web.domain>cocome</web.domain>
-				<web.host>192.168.48.206</web.host>
+				<web.domain>web</web.domain>
+				<web.host>localhost</web.host>
 				<web.httpPort>8080</web.httpPort>
-				<web.adminPort>4848</web.adminPort>
+				<web.adminPort>8048</web.adminPort>
 				<web.user>admin</web.user>
-				<web.password>admin</web.password>
+				<web.password></web.password>
 		
 				<!-- service adapter node deployment configuration -->
 				<serviceadapter.protocol>http</serviceadapter.protocol>
-				<serviceadapter.host>192.168.48.224</serviceadapter.host>
-				<serviceadapter.httpPort>8080</serviceadapter.httpPort>
-				<serviceadapter.adminPort>4848</serviceadapter.adminPort>
+				<serviceadapter.host>localhost</serviceadapter.host>
+				<serviceadapter.httpPort>8280</serviceadapter.httpPort>
+				<serviceadapter.adminPort>8248</serviceadapter.adminPort>
 				<serviceadapter.user>admin</serviceadapter.user>
-				<serviceadapter.password>admin</serviceadapter.password>				
+				<serviceadapter.password></serviceadapter.password>				
 				<serviceadapter.baseDir>/de.kit.ipd.cocome.cloud.serviceadapter/Services</serviceadapter.baseDir>		
 			</properties>
 		</profile>
@@ -63,4 +63,4 @@
 	<activeProfiles>
 		<activeProfile>cocome-context</activeProfile>
 	</activeProfiles>
-</settings>
+</settings>
\ No newline at end of file