diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
index 1cf5c591..24bcf3ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/Locanda_target
/target
+.idea/
+
diff --git a/README.txt b/README.txt
index cb939eb4..aff30fe2 100644
--- a/README.txt
+++ b/README.txt
@@ -40,4 +40,15 @@ Starting from v0.3 each resource of the system can be searched by using a simple
HOUSED
Starting from v0.4, you can set for each booking, at the check-in, each person housed in that room.
-Have fun with Locanda!
\ No newline at end of file
+Have fun with Locanda!
+
+## How to run the application
+
+First of all you need to use JDK 1.7. I'm using Tomcat 7 as application server, you can download the *CORE* version [here](http://tomcat.apache.org/download-70.cgi).
+
+Now you need to import all libraries specified in pom.xml and run two maven commands:
+* clean
+* install
+
+The install command will create a new folder called Locanda_target in which you can find Locanda.war. Execute this war in your server and, if you had no error, you should see the web application running in your browser (http://localhost:8080/).
+
diff --git a/global.properties b/global.properties
index 6d7a6b9b..2a23773c 100644
--- a/global.properties
+++ b/global.properties
@@ -1,3 +1,5 @@
-resource.folder=${project.build.directory}/${project.name}_resources
+resource.folder="Locanda_target/Locanda_resources"
+# resource.folder=${project.build.directory}/${project.name}_resources
solr.homeDir=${resource.folder}/solr
-solr.configFile=${solr.homeDir}/solr.xml
\ No newline at end of file
+solr.configFile=${solr.homeDir}/solr.xml
+
diff --git a/locanda.iml b/locanda.iml
new file mode 100644
index 00000000..793bab0d
--- /dev/null
+++ b/locanda.iml
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ file://$MODULE_DIR$/webroot/WEB-INF/applicationContext-infrastructure.xml
+ file://$MODULE_DIR$/webroot/WEB-INF/dispatcher-servlet.xml
+ file://$MODULE_DIR$/webroot/WEB-INF/applicationContext.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b3cb0ae5..8ca6dc73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
${project.build.directory}/${project.name}_resources
- /opt/h2/databases
+ opt/h2/databases
UTF-8
@@ -376,7 +376,7 @@
org.springframework
spring-jdbc
- 3.2.0.RELEASE
+ 4.1.0.RELEASE
com.sun.jersey.contribs
@@ -408,7 +408,7 @@
org.springframework
spring-context
- 3.2.0.RELEASE
+ 4.1.0.RELEASE
org.apache.struts
@@ -423,7 +423,7 @@
org.springframework
spring-web
- 3.2.0.RELEASE
+ 4.1.0.RELEASE
org.apache.solr
diff --git a/webroot/WEB-INF/applicationContext.xml b/webroot/WEB-INF/applicationContext.xml
index 7bcc1aca..38ac3595 100644
--- a/webroot/WEB-INF/applicationContext.xml
+++ b/webroot/WEB-INF/applicationContext.xml
@@ -45,12 +45,15 @@
-
+
+
+