diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..c5e5286
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.hibernate:hibernate-core:5.2.5.Final"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jboss.logging:jboss-logging:3.3.0.Final"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.javassist:javassist:3.20.0-GA"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: antlr:antlr:2.7.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jboss:jandex:2.0.3.Final"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: com.fasterxml:classmate:1.3.0"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: dom4j:dom4j:1.6.1"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: javax.enterprise:cdi-api:1.1"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: javax.el:el-api:2.2"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:1.0.0.Beta1"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: javax.annotation:jsr250-api:1.0"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: javax.inject:javax.inject:1"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.apache.tomcat:tomcat-servlet-api:9.0.0.M15"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.slf4j:slf4j-log4j12:1.5.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: log4j:log4j:1.2.14"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.slf4j:slf4j-api:1.5.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: postgresql:postgresql:9.1-901.jdbc4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.hibernate:hibernate-annotations:3.5.6-Final"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Final"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: commons-beanutils:commons-beanutils:1.9.3"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: commons-logging:commons-logging:1.2"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: commons-collections:commons-collections:3.2.2"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: junit:junit:4.12"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: org.hamcrest:hamcrest-core:1.3"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Maven: taglibs:standard:1.1.2"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23.xml b/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23.xml
index 05e008e..407798b 100644
--- a/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23.xml
+++ b/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23.xml
@@ -9,7 +9,7 @@
     </database>
     <schema id="3" parent="2" name="public">
       <ObjectId>2200</ObjectId>
-      <IntrospectionTimestamp>2017-06-08.14:53:07.452</IntrospectionTimestamp>
+      <IntrospectionTimestamp>2017-06-13.16:54:11.462</IntrospectionTimestamp>
       <IntrospectionStateNumber>17257</IntrospectionStateNumber>
       <Current>1</Current>
       <Visible>1</Visible>
diff --git a/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23/_metadata_/metadata b/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23/_metadata_/metadata
index 36f89ba..894760d 100644
Binary files a/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23/_metadata_/metadata and b/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23/_metadata_/metadata differ
diff --git a/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23/_metadata_/metadata.values.at b/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23/_metadata_/metadata.values.at
index 82caa9c..7202be8 100644
Binary files a/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23/_metadata_/metadata.values.at and b/.idea/dataSources/767b098c-c5bc-42ee-b3bc-d02e521ecc23/_metadata_/metadata.values.at differ
diff --git a/.idea/libraries/Maven__taglibs_standard_1_1_2.xml b/.idea/libraries/Maven__taglibs_standard_1_1_2.xml
new file mode 100644
index 0000000..8d7bb73
--- /dev/null
+++ b/.idea/libraries/Maven__taglibs_standard_1_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: taglibs:standard:1.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/taglibs/standard/1.1.2/standard-1.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/taglibs/standard/1.1.2/standard-1.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/taglibs/standard/1.1.2/standard-1.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.project b/.project
new file mode 100644
index 0000000..4c80f0c
--- /dev/null
+++ b/.project
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>LO53_mobile_localization</name>
+	<comment/>
+	<projects/>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments/>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/LO53_mobile_localization.eml b/LO53_mobile_localization.eml
new file mode 100644
index 0000000..397e1c1
--- /dev/null
+++ b/LO53_mobile_localization.eml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component LANGUAGE_LEVEL="JDK_1_7" inheritJdk="true">
+	<output-test url="file://$MODULE_DIR$/target/test-classes"/>
+	<contentEntry url="file://$MODULE_DIR$">
+		<testFolder url="file://$MODULE_DIR$/src/test/java"/>
+		<excludeFolder url="file://$MODULE_DIR$/target"/>
+	</contentEntry>
+	<lib name="Maven: org.slf4j:slf4j-log4j12:1.5.8" scope="RUNTIME"/>
+	<lib name="Maven: log4j:log4j:1.2.14" scope="RUNTIME"/>
+	<lib name="Maven: junit:junit:4.12" scope="TEST"/>
+	<lib name="Maven: org.hamcrest:hamcrest-core:1.3" scope="TEST"/>
+	<levels>
+		<level name="Maven: org.hibernate:hibernate-core:5.2.5.Final" value="project"/>
+		<level name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" value="project"/>
+		<level name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" value="project"/>
+		<level name="Maven: org.javassist:javassist:3.20.0-GA" value="project"/>
+		<level name="Maven: antlr:antlr:2.7.7" value="project"/>
+		<level name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" value="project"/>
+		<level name="Maven: org.jboss:jandex:2.0.3.Final" value="project"/>
+		<level name="Maven: com.fasterxml:classmate:1.3.0" value="project"/>
+		<level name="Maven: dom4j:dom4j:1.6.1" value="project"/>
+		<level name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" value="project"/>
+		<level name="Maven: javax.enterprise:cdi-api:1.1" value="project"/>
+		<level name="Maven: javax.el:el-api:2.2" value="project"/>
+		<level name="Maven: org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:1.0.0.Beta1" value="project"/>
+		<level name="Maven: javax.annotation:jsr250-api:1.0" value="project"/>
+		<level name="Maven: javax.inject:javax.inject:1" value="project"/>
+		<level name="Maven: org.apache.tomcat:tomcat-servlet-api:9.0.0.M15" value="project"/>
+		<level name="Maven: org.slf4j:slf4j-log4j12:1.5.8" value="project"/>
+		<level name="Maven: log4j:log4j:1.2.14" value="project"/>
+		<level name="Maven: org.slf4j:slf4j-api:1.5.8" value="project"/>
+		<level name="Maven: postgresql:postgresql:9.1-901.jdbc4" value="project"/>
+		<level name="Maven: org.hibernate:hibernate-annotations:3.5.6-Final" value="project"/>
+		<level name="Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Final" value="project"/>
+		<level name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final" value="project"/>
+		<level name="Maven: commons-beanutils:commons-beanutils:1.9.3" value="project"/>
+		<level name="Maven: commons-logging:commons-logging:1.2" value="project"/>
+		<level name="Maven: commons-collections:commons-collections:3.2.2" value="project"/>
+		<level name="Maven: junit:junit:4.12" value="project"/>
+		<level name="Maven: org.hamcrest:hamcrest-core:1.3" value="project"/>
+		<level name="Maven: taglibs:standard:1.1.2" value="project"/>
+	</levels>
+</component>
diff --git a/LO53_mobile_localization.userlibraries b/LO53_mobile_localization.userlibraries
new file mode 100644
index 0000000..775425e
--- /dev/null
+++ b/LO53_mobile_localization.userlibraries
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eclipse-userlibraries>
+  <library name="Maven: antlr:antlr:2.7.7">
+    <archive path="C:/Users/Thomas/.m2/repository/antlr/antlr/2.7.7/antlr-2.7.7.jar" />
+  </library>
+  <library name="Maven: com.fasterxml:classmate:1.3.0">
+    <archive path="C:/Users/Thomas/.m2/repository/com/fasterxml/classmate/1.3.0/classmate-1.3.0.jar" />
+  </library>
+  <library name="Maven: commons-beanutils:commons-beanutils:1.9.3">
+    <archive path="C:/Users/Thomas/.m2/repository/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3.jar" />
+  </library>
+  <library name="Maven: commons-collections:commons-collections:3.2.2">
+    <archive path="C:/Users/Thomas/.m2/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" />
+  </library>
+  <library name="Maven: commons-logging:commons-logging:1.2">
+    <archive path="C:/Users/Thomas/.m2/repository/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" />
+  </library>
+  <library name="Maven: dom4j:dom4j:1.6.1">
+    <archive path="C:/Users/Thomas/.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" />
+  </library>
+  <library name="Maven: javax.annotation:jsr250-api:1.0">
+    <archive path="C:/Users/Thomas/.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" />
+  </library>
+  <library name="Maven: javax.el:el-api:2.2">
+    <archive path="C:/Users/Thomas/.m2/repository/javax/el/el-api/2.2/el-api-2.2.jar" />
+  </library>
+  <library name="Maven: javax.enterprise:cdi-api:1.1">
+    <archive path="C:/Users/Thomas/.m2/repository/javax/enterprise/cdi-api/1.1/cdi-api-1.1.jar" />
+  </library>
+  <library name="Maven: javax.inject:javax.inject:1">
+    <archive path="C:/Users/Thomas/.m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar" />
+  </library>
+  <library name="Maven: junit:junit:4.12">
+    <archive path="C:/Users/Thomas/.m2/repository/junit/junit/4.12/junit-4.12.jar" />
+  </library>
+  <library name="Maven: log4j:log4j:1.2.14">
+    <archive path="C:/Users/Thomas/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar" />
+  </library>
+  <library name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1">
+    <archive path="C:/Users/Thomas/.m2/repository/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar" />
+  </library>
+  <library name="Maven: org.apache.tomcat:tomcat-servlet-api:9.0.0.M15">
+    <archive path="C:/Users/Thomas/.m2/repository/org/apache/tomcat/tomcat-servlet-api/9.0.0.M15/tomcat-servlet-api-9.0.0.M15.jar" />
+  </library>
+  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
+    <archive path="C:/Users/Thomas/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" />
+  </library>
+  <library name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final">
+    <archive path="C:/Users/Thomas/.m2/repository/org/hibernate/common/hibernate-commons-annotations/5.0.1.Final/hibernate-commons-annotations-5.0.1.Final.jar" />
+  </library>
+  <library name="Maven: org.hibernate:hibernate-annotations:3.5.6-Final">
+    <archive path="C:/Users/Thomas/.m2/repository/org/hibernate/hibernate-annotations/3.5.6-Final/hibernate-annotations-3.5.6-Final.jar" />
+  </library>
+  <library name="Maven: org.hibernate:hibernate-commons-annotations:3.2.0.Final">
+    <archive path="C:/Users/Thomas/.m2/repository/org/hibernate/hibernate-commons-annotations/3.2.0.Final/hibernate-commons-annotations-3.2.0.Final.jar" />
+  </library>
+  <library name="Maven: org.hibernate:hibernate-core:5.2.5.Final">
+    <archive path="C:/Users/Thomas/.m2/repository/org/hibernate/hibernate-core/5.2.5.Final/hibernate-core-5.2.5.Final.jar" />
+  </library>
+  <library name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.0.Final">
+    <archive path="C:/Users/Thomas/.m2/repository/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final.jar" />
+  </library>
+  <library name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final">
+    <archive path="C:/Users/Thomas/.m2/repository/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final.jar" />
+  </library>
+  <library name="Maven: org.javassist:javassist:3.20.0-GA">
+    <archive path="C:/Users/Thomas/.m2/repository/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA.jar" />
+  </library>
+  <library name="Maven: org.jboss:jandex:2.0.3.Final">
+    <archive path="C:/Users/Thomas/.m2/repository/org/jboss/jandex/2.0.3.Final/jandex-2.0.3.Final.jar" />
+  </library>
+  <library name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final">
+    <archive path="C:/Users/Thomas/.m2/repository/org/jboss/logging/jboss-logging/3.3.0.Final/jboss-logging-3.3.0.Final.jar" />
+  </library>
+  <library name="Maven: org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:1.0.0.Beta1">
+    <archive path="C:/Users/Thomas/.m2/repository/org/jboss/spec/javax/interceptor/jboss-interceptors-api_1.1_spec/1.0.0.Beta1/jboss-interceptors-api_1.1_spec-1.0.0.Beta1.jar" />
+  </library>
+  <library name="Maven: org.slf4j:slf4j-api:1.5.8">
+    <archive path="C:/Users/Thomas/.m2/repository/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar" />
+  </library>
+  <library name="Maven: org.slf4j:slf4j-log4j12:1.5.8">
+    <archive path="C:/Users/Thomas/.m2/repository/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar" />
+  </library>
+  <library name="Maven: postgresql:postgresql:9.1-901.jdbc4">
+    <archive path="C:/Users/Thomas/.m2/repository/postgresql/postgresql/9.1-901.jdbc4/postgresql-9.1-901.jdbc4.jar" />
+  </library>
+  <library name="Maven: taglibs:standard:1.1.2">
+    <archive path="C:/Users/Thomas/.m2/repository/taglibs/standard/1.1.2/standard-1.1.2.jar" />
+  </library>
+</eclipse-userlibraries>
+
--
libgit2 0.21.4