diff --git a/AMW_angular/pom.xml b/AMW_angular/pom.xml
index d98763756..25a208794 100644
--- a/AMW_angular/pom.xml
+++ b/AMW_angular/pom.xml
@@ -1,85 +1,85 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>ch.puzzle.itc.mobiliar</groupId>
-        <artifactId>AMW_parent</artifactId>
-        <version>1.17.3-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>AMW_angular</artifactId>
-    <packaging>war</packaging>
-    <name>AMW_angular</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>${version.war.plugin}</version>
-                <configuration>
-                    <webResources>
-                        <!-- filter only the index HTML file  -->
-                        <resource>
-                            <directory>io/dist</directory>
-                            <includes>
-                                <include>index.html</include>
-                            </includes>
-                            <filtering>true</filtering>
-                        </resource>
-                        <!-- everything else is not filtered -->
-                        <resource>
-                            <directory>io/dist</directory>
-                            <excludes>
-                                <exclude>index.html</exclude>
-                            </excludes>
-                            <filtering>false</filtering>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.github.eirslett</groupId>
-                <artifactId>frontend-maven-plugin</artifactId>
-                <version>1.6</version>
-                <executions>
-                    <execution>
-                        <id>install node and yarn</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>install-node-and-yarn</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>yarn install</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                        <configuration>
-                            <arguments>install</arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>yarn build</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>yarn</goal>
-                        </goals>
-                        <configuration>
-                            <arguments>run build</arguments>
-                            <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                      <nodeVersion>v8.9.0</nodeVersion>
-                      <yarnVersion>v1.3.2</yarnVersion>
-                      <workingDirectory>io</workingDirectory>
-                      <installDirectory>io</installDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>ch.puzzle.itc.mobiliar</groupId>
+        <artifactId>AMW_parent</artifactId>
+        <version>1.17.3</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>AMW_angular</artifactId>
+    <packaging>war</packaging>
+    <name>AMW_angular</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${version.war.plugin}</version>
+                <configuration>
+                    <webResources>
+                        <!-- filter only the index HTML file  -->
+                        <resource>
+                            <directory>io/dist</directory>
+                            <includes>
+                                <include>index.html</include>
+                            </includes>
+                            <filtering>true</filtering>
+                        </resource>
+                        <!-- everything else is not filtered -->
+                        <resource>
+                            <directory>io/dist</directory>
+                            <excludes>
+                                <exclude>index.html</exclude>
+                            </excludes>
+                            <filtering>false</filtering>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <id>install node and yarn</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>install-node-and-yarn</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>yarn install</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>yarn</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>yarn build</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>yarn</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>run build</arguments>
+                            <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                      <nodeVersion>v8.9.0</nodeVersion>
+                      <yarnVersion>v1.3.2</yarnVersion>
+                      <workingDirectory>io</workingDirectory>
+                      <installDirectory>io</installDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+
diff --git a/AMW_business/pom.xml b/AMW_business/pom.xml
index 25e0db407..a9798a86c 100644
--- a/AMW_business/pom.xml
+++ b/AMW_business/pom.xml
@@ -1,238 +1,238 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_parent</artifactId>
-		<version>1.17.3-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>AMW_business</artifactId>
-	<name>AMW_business</name>
-	<packaging>ejb</packaging>
-
-	<description />
-
-	<build>
-		<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-		<outputDirectory>${basedir}/build/classes</outputDirectory>
-		<resources>
-			<resource>
-				<directory>${basedir}/src/main/java</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-			<resource>
-				<directory>${basedir}/src/main/resources</directory>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-		       <groupId>org.apache.maven.plugins</groupId>
-		       <artifactId>maven-jar-plugin</artifactId>
-		       <executions>
-		         <execution>
-		           <goals>
-		             <goal>test-jar</goal>
-		           </goals>
-		         </execution>
-		       </executions>
-		    </plugin>
-		</plugins>
-	</build>
-	<dependencies>
-
-		<!-- Project dependency -->
-		<dependency>
-			<groupId>ch.puzzle.itc.mobiliar</groupId>
-			<artifactId>AMW_commons</artifactId>
-		</dependency>
-		
-
-		<!-- Declare the APIs we depend on and need for compilation. All of them are provided by JBoss AS 7 -->
-
-		<!-- Import the EJB API, we use provided scope as the API is included in JBoss AS 7 -->
-		<dependency>
-			<groupId>org.jboss.spec.javax.ejb</groupId>
-			<artifactId>jboss-ejb-api_3.1_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- Import the CDI API, we use provided scope as the API is included in JBoss AS 7 -->
-		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- Import the JPA API, we use provided scope as the API is included in JBoss AS 7 -->
-		<dependency>
-			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.0-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- Envers -->
-		<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-envers</artifactId> <version>3.6.8.Final</version> 
-			</dependency> -->
-
-		<!-- JSR-303 (Bean Validation) Implementation -->
-		<!-- Provides portable constraints such as @Email -->
-		<!-- Hibernate Validator is shipped in JBoss AS 7 -->
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- Envers -->
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-envers</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>dom4j</artifactId>
-					<groupId>dom4j</groupId>
-				</exclusion>
-			</exclusions>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>dom4j</artifactId>
-					<groupId>dom4j</groupId>
-				</exclusion>
-			</exclusions>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.freemarker</groupId>
-			<artifactId>freemarker</artifactId>
-			<version>2.3.23</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.3</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.7</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>13.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mailapi</artifactId>
-			<version>1.4.2</version>
-			<scope>provided</scope>
-		</dependency>
-		<!-- for jaxb annotation processing for json with jackson -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.9.6</version>
-			<scope>provided</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.liquibase</groupId>
-			<artifactId>liquibase-cdi</artifactId>
-			<version>${version.liquibase}</version>
-		</dependency>
-		<dependency>
-			<!-- logging adapter to prevent liquibase from logging to stderr -->
-			<groupId>com.mattbertolini</groupId>
-			<artifactId>liquibase-slf4j</artifactId>
-			<version>${version.liquibase-slf4j}</version>
-		</dependency>
-
-        <!-- Test scope dependencies -->
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
-			<version>1.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-    		<groupId>junit</groupId>
-    		<artifactId>junit</artifactId>
-    		<scope>test</scope>
-		</dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-		<dependency>
-			<groupId>org.jboss.weld.se</groupId>
-			<artifactId>weld-se-core</artifactId>
-			<version>1.1.8.Final</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.7</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<version>1.4.197</version>
-			<scope>test</scope>
-		</dependency>
-		<!-- Needed for TestSetTest on Java 8 -->
-		<dependency>
-		    <groupId>xerces</groupId>
-		    <artifactId>xercesImpl</artifactId>
-		    <version>2.11.0</version>
-		    <scope>test</scope>
-		</dependency>
-            
-
-		<!-- Optional, but highly recommended -->
-		<dependency>
-			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
-			<version>1.7.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>jaxen</groupId>
-			<artifactId>jaxen</artifactId>
-			<version>1.1.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish</groupId>
-			<artifactId>javax.xml.rpc</artifactId>
-			<version>10.0-b28</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-artifact</artifactId>
-			<version>3.0.3</version>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<groupId>ch.puzzle.itc.mobiliar</groupId>
+		<artifactId>AMW_parent</artifactId>
+		<version>1.17.3</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>AMW_business</artifactId>
+	<name>AMW_business</name>
+	<packaging>ejb</packaging>
+
+	<description />
+
+	<build>
+		<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+		<outputDirectory>${basedir}/build/classes</outputDirectory>
+		<resources>
+			<resource>
+				<directory>${basedir}/src/main/java</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>${basedir}/src/main/resources</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+		       <groupId>org.apache.maven.plugins</groupId>
+		       <artifactId>maven-jar-plugin</artifactId>
+		       <executions>
+		         <execution>
+		           <goals>
+		             <goal>test-jar</goal>
+		           </goals>
+		         </execution>
+		       </executions>
+		    </plugin>
+		</plugins>
+	</build>
+	<dependencies>
+
+		<!-- Project dependency -->
+		<dependency>
+			<groupId>ch.puzzle.itc.mobiliar</groupId>
+			<artifactId>AMW_commons</artifactId>
+		</dependency>
+		
+
+		<!-- Declare the APIs we depend on and need for compilation. All of them are provided by JBoss AS 7 -->
+
+		<!-- Import the EJB API, we use provided scope as the API is included in JBoss AS 7 -->
+		<dependency>
+			<groupId>org.jboss.spec.javax.ejb</groupId>
+			<artifactId>jboss-ejb-api_3.1_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Import the CDI API, we use provided scope as the API is included in JBoss AS 7 -->
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Import the JPA API, we use provided scope as the API is included in JBoss AS 7 -->
+		<dependency>
+			<groupId>org.hibernate.javax.persistence</groupId>
+			<artifactId>hibernate-jpa-2.0-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Envers -->
+		<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-envers</artifactId> <version>3.6.8.Final</version> 
+			</dependency> -->
+
+		<!-- JSR-303 (Bean Validation) Implementation -->
+		<!-- Provides portable constraints such as @Email -->
+		<!-- Hibernate Validator is shipped in JBoss AS 7 -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Envers -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-envers</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>dom4j</artifactId>
+					<groupId>dom4j</groupId>
+				</exclusion>
+			</exclusions>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>dom4j</artifactId>
+					<groupId>dom4j</groupId>
+				</exclusion>
+			</exclusions>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+			<version>2.3.23</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.7</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>13.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mailapi</artifactId>
+			<version>1.4.2</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- for jaxb annotation processing for json with jackson -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.9.6</version>
+			<scope>provided</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.liquibase</groupId>
+			<artifactId>liquibase-cdi</artifactId>
+			<version>${version.liquibase}</version>
+		</dependency>
+		<dependency>
+			<!-- logging adapter to prevent liquibase from logging to stderr -->
+			<groupId>com.mattbertolini</groupId>
+			<artifactId>liquibase-slf4j</artifactId>
+			<version>${version.liquibase-slf4j}</version>
+		</dependency>
+
+        <!-- Test scope dependencies -->
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+    		<groupId>junit</groupId>
+    		<artifactId>junit</artifactId>
+    		<scope>test</scope>
+		</dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+		<dependency>
+			<groupId>org.jboss.weld.se</groupId>
+			<artifactId>weld-se-core</artifactId>
+			<version>1.1.8.Final</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.7.7</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<version>1.4.197</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- Needed for TestSetTest on Java 8 -->
+		<dependency>
+		    <groupId>xerces</groupId>
+		    <artifactId>xercesImpl</artifactId>
+		    <version>2.11.0</version>
+		    <scope>test</scope>
+		</dependency>
+            
+
+		<!-- Optional, but highly recommended -->
+		<dependency>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant</artifactId>
+			<version>1.7.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>jaxen</groupId>
+			<artifactId>jaxen</artifactId>
+			<version>1.1.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish</groupId>
+			<artifactId>javax.xml.rpc</artifactId>
+			<version>10.0-b28</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-artifact</artifactId>
+			<version>3.0.3</version>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+</project>
diff --git a/AMW_commons/pom.xml b/AMW_commons/pom.xml
index 8c4a4016e..e9fadd06e 100644
--- a/AMW_commons/pom.xml
+++ b/AMW_commons/pom.xml
@@ -1,65 +1,65 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_parent</artifactId>
-		<version>1.17.3-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>AMW_commons</artifactId>
-	<name>AMW_commons</name>
-	
-	<build>
-		<resources>
-		   <resource>
-		      <directory>src/main/resources</directory>
-		      <filtering>true</filtering>
-		   </resource>
-		</resources>
-	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>net.sf.json-lib</groupId>
-			<artifactId>json-lib</artifactId>
-			<version>2.2.3</version>
-			<classifier>jdk15</classifier>
-		</dependency>
-		<!-- Test scope dependencies -->
-		<dependency>
-    		<groupId>junit</groupId>
-    		<artifactId>junit</artifactId>
-    		<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>1.5.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>1.5.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<version>6.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.9.6</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<groupId>ch.puzzle.itc.mobiliar</groupId>
+		<artifactId>AMW_parent</artifactId>
+		<version>1.17.3</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>AMW_commons</artifactId>
+	<name>AMW_commons</name>
+	
+	<build>
+		<resources>
+		   <resource>
+		      <directory>src/main/resources</directory>
+		      <filtering>true</filtering>
+		   </resource>
+		</resources>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>net.sf.json-lib</groupId>
+			<artifactId>json-lib</artifactId>
+			<version>2.2.3</version>
+			<classifier>jdk15</classifier>
+		</dependency>
+		<!-- Test scope dependencies -->
+		<dependency>
+    		<groupId>junit</groupId>
+    		<artifactId>junit</artifactId>
+    		<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>1.5.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>1.5.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax</groupId>
+			<artifactId>javaee-api</artifactId>
+			<version>6.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.9.6</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/AMW_db_scripts/pom.xml b/AMW_db_scripts/pom.xml
index 9faf61152..dd2405d6c 100644
--- a/AMW_db_scripts/pom.xml
+++ b/AMW_db_scripts/pom.xml
@@ -1,211 +1,211 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_parent</artifactId>
-		<version>1.17.3-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>AMW_db_scripts</artifactId>
-	<name>AMW_db_scripts</name>
-
-	<properties>
-		<!-- Explicitly declaring the source encoding eliminates the following 
-			message: -->
-		<!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered 
-			resources, i.e. build is platform dependent! -->
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-		<!-- JBoss dependency versions -->
-		<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
-		<version.jboss.spec.javaee.6.0>1.0.7.Final</version.jboss.spec.javaee.6.0>
-
-		<!-- dependency versions -->
-		<version.h2>1.4.197</version.h2>
-		<version.pg>9.4-1200-jdbc41</version.pg>
-		<version.ora>11.2.0.3</version.ora>
-		
-		<version.hibernate4-maven-plugin>1.0.5</version.hibernate4-maven-plugin>
-		<version.ant-contrib>20020829</version.ant-contrib>
-
-		<!-- maven-compiler-plugin -->
-		<maven.compiler.target>1.7</maven.compiler.target>
-		<maven.compiler.source>1.7</maven.compiler.source>
-
-		<db>h2.test</db>
-		<goal>updateSQL</goal>
-	</properties>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.liquibase</groupId>
-			<artifactId>liquibase-cdi</artifactId>
-			<version>${version.liquibase}</version>
-		</dependency>
-
-		<dependency>
-			<!-- logging adapter to prevent liquibase from logging to stderr -->
-			<groupId>com.mattbertolini</groupId>
-			<artifactId>liquibase-slf4j</artifactId>
-			<version>${version.liquibase-slf4j}</version>
-		</dependency>
-
-	</dependencies>
-
-	<profiles>
-		<profile>
-			<id>h2</id>
-			<dependencies>
-				<dependency>
-					<groupId>com.h2database</groupId>
-					<artifactId>h2</artifactId>
-					<version>${version.h2}</version>
-				</dependency>
-			</dependencies>
-		</profile>
-		
-		<profile>
-			<id>ora</id>
-			<dependencies>
-				<dependency>
-					<groupId>com.oracle</groupId>
-					<artifactId>ojdbc6</artifactId>
-					<version>${version.ora}</version>
-				</dependency>
-			</dependencies>
-		</profile>
-
-		<profile>
-			<id>pg</id>
-			<dependencies>
-				<dependency>
-					<groupId>org.postgresql</groupId>
-					<artifactId>postgresql</artifactId>
-					<version>${version.pg}</version>
-				</dependency>
-			</dependencies>
-		</profile>
-
-        <profile>
-            <id>liquibasecompare</id>
-            <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/resources</directory>
-                        <filtering>true</filtering>
-                    </resource>
-                </resources>
-
-                <plugins>
-                    <plugin>
-                        <groupId>de.juplo</groupId>
-                        <artifactId>hibernate4-maven-plugin</artifactId>
-                        <version>${version.hibernate4-maven-plugin}</version>
-                        <executions>
-                            <execution>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>export</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <force>true</force>
-                            <hibernateDialect>org.hibernate.dialect.Oracle10gDialect</hibernateDialect>
-                            <hibernateProperties>${project.build.outputDirectory}/liquibase/hibernate.maven-plugin.properties</hibernateProperties>
-                            <target>EXPORT</target>
-                            <envers>true</envers>
-                            <outputDirectory>../AMW_business/build/classes</outputDirectory>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>ch.puzzle.itc.mobiliar</groupId>
-                                <artifactId>AMW_business</artifactId>
-                                <version>1.17.3-SNAPSHOT</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-		<profile>
-			<id>liquibase</id>
-			<build>
-				<resources>
-					<resource>
-						<directory>src/main/resources</directory>
-						<filtering>true</filtering>
-					</resource>
-				</resources>
-
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>initializeLiquibase</id>
-								<phase>initialize</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<tasks>
-										<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-										<mkdir dir="${project.build.directory}/liquibase" />
-										<if>
-											<equals arg1="${goal}" arg2="generateChangeLog" />
-											<then>
-												<delete>
-													<fileset dir="${project.build.directory}/liquibase" includes="generated*.xml" />
-												</delete>
-											</then>
-										</if>
-										<if>
-											<equals arg1="${goal}" arg2="diff" />
-											<then>
-												<delete>
-													<fileset dir="${project.build.directory}/liquibase" includes="diff.changelog.xml" />
-												</delete>
-											</then>
-										</if>
-									</tasks>
-								</configuration>
-							</execution>
-						</executions>
-						<dependencies>
-							<dependency>
-								<groupId>ant-contrib</groupId>
-								<artifactId>ant-contrib</artifactId>
-								<version>${version.ant-contrib}</version>
-							</dependency>
-						</dependencies>
-					</plugin>
-
-					<plugin>
-						<groupId>org.liquibase</groupId>
-						<artifactId>liquibase-maven-plugin</artifactId>
-						<version>${version.liquibase}</version>
-						<configuration>
-							<propertyFileWillOverride>true</propertyFileWillOverride>
-							<propertyFile>${project.build.outputDirectory}/liquibase/liquibase-${db}.properties</propertyFile>
-							<promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
-							<migrationSqlOutputFile>${project.build.directory}/liquibase/migrate${project.artifactId}-${project.version}.sql</migrationSqlOutputFile>
-						</configuration>
-						<executions>
-							<execution>
-								<phase>compile</phase>
-								<goals>  <!-- Variable substitution in goal only works in profiles. -->
-									<goal>${goal}</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-	</profiles>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<groupId>ch.puzzle.itc.mobiliar</groupId>
+		<artifactId>AMW_parent</artifactId>
+		<version>1.17.3</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>AMW_db_scripts</artifactId>
+	<name>AMW_db_scripts</name>
+
+	<properties>
+		<!-- Explicitly declaring the source encoding eliminates the following 
+			message: -->
+		<!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered 
+			resources, i.e. build is platform dependent! -->
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+		<!-- JBoss dependency versions -->
+		<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
+		<version.jboss.spec.javaee.6.0>1.0.7.Final</version.jboss.spec.javaee.6.0>
+
+		<!-- dependency versions -->
+		<version.h2>1.4.197</version.h2>
+		<version.pg>9.4-1200-jdbc41</version.pg>
+		<version.ora>11.2.0.3</version.ora>
+		
+		<version.hibernate4-maven-plugin>1.0.5</version.hibernate4-maven-plugin>
+		<version.ant-contrib>20020829</version.ant-contrib>
+
+		<!-- maven-compiler-plugin -->
+		<maven.compiler.target>1.7</maven.compiler.target>
+		<maven.compiler.source>1.7</maven.compiler.source>
+
+		<db>h2.test</db>
+		<goal>updateSQL</goal>
+	</properties>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.liquibase</groupId>
+			<artifactId>liquibase-cdi</artifactId>
+			<version>${version.liquibase}</version>
+		</dependency>
+
+		<dependency>
+			<!-- logging adapter to prevent liquibase from logging to stderr -->
+			<groupId>com.mattbertolini</groupId>
+			<artifactId>liquibase-slf4j</artifactId>
+			<version>${version.liquibase-slf4j}</version>
+		</dependency>
+
+	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>h2</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.h2database</groupId>
+					<artifactId>h2</artifactId>
+					<version>${version.h2}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		
+		<profile>
+			<id>ora</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc6</artifactId>
+					<version>${version.ora}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+
+		<profile>
+			<id>pg</id>
+			<dependencies>
+				<dependency>
+					<groupId>org.postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+					<version>${version.pg}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+
+        <profile>
+            <id>liquibasecompare</id>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <filtering>true</filtering>
+                    </resource>
+                </resources>
+
+                <plugins>
+                    <plugin>
+                        <groupId>de.juplo</groupId>
+                        <artifactId>hibernate4-maven-plugin</artifactId>
+                        <version>${version.hibernate4-maven-plugin}</version>
+                        <executions>
+                            <execution>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>export</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <force>true</force>
+                            <hibernateDialect>org.hibernate.dialect.Oracle10gDialect</hibernateDialect>
+                            <hibernateProperties>${project.build.outputDirectory}/liquibase/hibernate.maven-plugin.properties</hibernateProperties>
+                            <target>EXPORT</target>
+                            <envers>true</envers>
+                            <outputDirectory>../AMW_business/build/classes</outputDirectory>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>ch.puzzle.itc.mobiliar</groupId>
+                                <artifactId>AMW_business</artifactId>
+                                <version>1.17.3</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+		<profile>
+			<id>liquibase</id>
+			<build>
+				<resources>
+					<resource>
+						<directory>src/main/resources</directory>
+						<filtering>true</filtering>
+					</resource>
+				</resources>
+
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>initializeLiquibase</id>
+								<phase>initialize</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<tasks>
+										<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+										<mkdir dir="${project.build.directory}/liquibase" />
+										<if>
+											<equals arg1="${goal}" arg2="generateChangeLog" />
+											<then>
+												<delete>
+													<fileset dir="${project.build.directory}/liquibase" includes="generated*.xml" />
+												</delete>
+											</then>
+										</if>
+										<if>
+											<equals arg1="${goal}" arg2="diff" />
+											<then>
+												<delete>
+													<fileset dir="${project.build.directory}/liquibase" includes="diff.changelog.xml" />
+												</delete>
+											</then>
+										</if>
+									</tasks>
+								</configuration>
+							</execution>
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>ant-contrib</groupId>
+								<artifactId>ant-contrib</artifactId>
+								<version>${version.ant-contrib}</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+
+					<plugin>
+						<groupId>org.liquibase</groupId>
+						<artifactId>liquibase-maven-plugin</artifactId>
+						<version>${version.liquibase}</version>
+						<configuration>
+							<propertyFileWillOverride>true</propertyFileWillOverride>
+							<propertyFile>${project.build.outputDirectory}/liquibase/liquibase-${db}.properties</propertyFile>
+							<promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
+							<migrationSqlOutputFile>${project.build.directory}/liquibase/migrate${project.artifactId}-${project.version}.sql</migrationSqlOutputFile>
+						</configuration>
+						<executions>
+							<execution>
+								<phase>compile</phase>
+								<goals>  <!-- Variable substitution in goal only works in profiles. -->
+									<goal>${goal}</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+	</profiles>
+</project>
diff --git a/AMW_ear/pom.xml b/AMW_ear/pom.xml
index ecfe924c8..1939a64d5 100644
--- a/AMW_ear/pom.xml
+++ b/AMW_ear/pom.xml
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_parent</artifactId>
-		<version>1.17.3-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>AMW_ear</artifactId>
-	<packaging>ear</packaging>
-	<name>AMW_ear</name>
-
-	<profiles>
-		<profile>
-			<id>default-profile</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<build>
-				<finalName>AMW</finalName>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-ear-plugin</artifactId>
-						<configuration>
-
-							<!-- Tell Maven we are using Java EE 6 -->
-							<version>6</version>
-							<!-- Use Java EE ear libraries as needed. Java EE ear libraries are 
-								in easy way to package any libraries needed in the ear, and automatically 
-								have any modules (EJB-JARs and WARs) use them -->
-							<defaultLibBundleDir>lib</defaultLibBundleDir>
-							<modules>
-								<jarModule>
-									<groupId>ch.puzzle.itc.mobiliar</groupId>
-									<artifactId>AMW_commons</artifactId>
-									<bundleFileName>AMW_commons.jar</bundleFileName>
-								</jarModule>
-								<ejbModule>
-									<groupId>ch.puzzle.itc.mobiliar</groupId>
-									<artifactId>AMW_business</artifactId>
-									<bundleFileName>AMW_business.jar</bundleFileName>
-								</ejbModule>
-								<webModule>
-									<groupId>ch.puzzle.itc.mobiliar</groupId>
-									<artifactId>AMW_web</artifactId>
-									<bundleFileName>AMW_web.war</bundleFileName>
-								</webModule>
-								<webModule>
-									<groupId>ch.puzzle.itc.mobiliar</groupId>
-									<artifactId>AMW_angular</artifactId>
-									<bundleFileName>AMW_angular.war</bundleFileName>
-								</webModule>
-								<webModule>
-									<groupId>ch.puzzle.itc.mobiliar</groupId>
-									<artifactId>AMW_rest</artifactId>
-									<bundleFileName>AMW_rest.war</bundleFileName>
-								</webModule>
-								<webModule>
-									<groupId>ch.puzzle.itc.mobiliar</groupId>
-									<artifactId>AMW_maia_federation</artifactId>
-									<bundleFileName>AMW_maia_federation.war</bundleFileName>
-								</webModule>
-							</modules>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			
-			<dependencies>
-				<!-- Depend on the ejb module and war so that we can package them -->
-				<dependency>
-					<groupId>ch.puzzle.itc.mobiliar</groupId>
-					<artifactId>AMW_commons</artifactId>
-				</dependency>
-				<dependency>
-					<groupId>ch.puzzle.itc.mobiliar</groupId>
-					<artifactId>AMW_business</artifactId>
-					<type>ejb</type>
-				</dependency>
-				<dependency>
-					<groupId>ch.puzzle.itc.mobiliar</groupId>
-					<artifactId>AMW_web</artifactId>
-					<type>war</type>
-				</dependency>
-				<dependency>
-					<groupId>ch.puzzle.itc.mobiliar</groupId>
-					<artifactId>AMW_angular</artifactId>
-					<type>war</type>
-				</dependency>
-				<dependency>
-					<groupId>ch.puzzle.itc.mobiliar</groupId>
-					<artifactId>AMW_rest</artifactId>
-					<type>war</type>
-				</dependency>
-				<dependency>
-					<groupId>ch.puzzle.itc.mobiliar</groupId>
-					<artifactId>AMW_maia_federation</artifactId>
-					<type>war</type>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<groupId>ch.puzzle.itc.mobiliar</groupId>
+		<artifactId>AMW_parent</artifactId>
+		<version>1.17.3</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>AMW_ear</artifactId>
+	<packaging>ear</packaging>
+	<name>AMW_ear</name>
+
+	<profiles>
+		<profile>
+			<id>default-profile</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<finalName>AMW</finalName>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-ear-plugin</artifactId>
+						<configuration>
+
+							<!-- Tell Maven we are using Java EE 6 -->
+							<version>6</version>
+							<!-- Use Java EE ear libraries as needed. Java EE ear libraries are 
+								in easy way to package any libraries needed in the ear, and automatically 
+								have any modules (EJB-JARs and WARs) use them -->
+							<defaultLibBundleDir>lib</defaultLibBundleDir>
+							<modules>
+								<jarModule>
+									<groupId>ch.puzzle.itc.mobiliar</groupId>
+									<artifactId>AMW_commons</artifactId>
+									<bundleFileName>AMW_commons.jar</bundleFileName>
+								</jarModule>
+								<ejbModule>
+									<groupId>ch.puzzle.itc.mobiliar</groupId>
+									<artifactId>AMW_business</artifactId>
+									<bundleFileName>AMW_business.jar</bundleFileName>
+								</ejbModule>
+								<webModule>
+									<groupId>ch.puzzle.itc.mobiliar</groupId>
+									<artifactId>AMW_web</artifactId>
+									<bundleFileName>AMW_web.war</bundleFileName>
+								</webModule>
+								<webModule>
+									<groupId>ch.puzzle.itc.mobiliar</groupId>
+									<artifactId>AMW_angular</artifactId>
+									<bundleFileName>AMW_angular.war</bundleFileName>
+								</webModule>
+								<webModule>
+									<groupId>ch.puzzle.itc.mobiliar</groupId>
+									<artifactId>AMW_rest</artifactId>
+									<bundleFileName>AMW_rest.war</bundleFileName>
+								</webModule>
+								<webModule>
+									<groupId>ch.puzzle.itc.mobiliar</groupId>
+									<artifactId>AMW_maia_federation</artifactId>
+									<bundleFileName>AMW_maia_federation.war</bundleFileName>
+								</webModule>
+							</modules>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+			
+			<dependencies>
+				<!-- Depend on the ejb module and war so that we can package them -->
+				<dependency>
+					<groupId>ch.puzzle.itc.mobiliar</groupId>
+					<artifactId>AMW_commons</artifactId>
+				</dependency>
+				<dependency>
+					<groupId>ch.puzzle.itc.mobiliar</groupId>
+					<artifactId>AMW_business</artifactId>
+					<type>ejb</type>
+				</dependency>
+				<dependency>
+					<groupId>ch.puzzle.itc.mobiliar</groupId>
+					<artifactId>AMW_web</artifactId>
+					<type>war</type>
+				</dependency>
+				<dependency>
+					<groupId>ch.puzzle.itc.mobiliar</groupId>
+					<artifactId>AMW_angular</artifactId>
+					<type>war</type>
+				</dependency>
+				<dependency>
+					<groupId>ch.puzzle.itc.mobiliar</groupId>
+					<artifactId>AMW_rest</artifactId>
+					<type>war</type>
+				</dependency>
+				<dependency>
+					<groupId>ch.puzzle.itc.mobiliar</groupId>
+					<artifactId>AMW_maia_federation</artifactId>
+					<type>war</type>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+</project>
diff --git a/AMW_maia_federation/pom.xml b/AMW_maia_federation/pom.xml
index a54ac093e..e45f36376 100644
--- a/AMW_maia_federation/pom.xml
+++ b/AMW_maia_federation/pom.xml
@@ -1,247 +1,247 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <parent>
-        <groupId>ch.puzzle.itc.mobiliar</groupId>
-        <artifactId>AMW_parent</artifactId>
-        <version>1.17.3-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <name>AMW_maia_federation</name>
-    <artifactId>AMW_maia_federation</artifactId>
-    <packaging>war</packaging>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>generated-sources/main/java</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>src/main/webapp</directory>
-                            <filtering>true</filtering>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${basedir}/generated-sources/main/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>generate</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jvnet.jax-ws-commons</groupId>
-                        <artifactId>jaxws-maven-plugin</artifactId>
-                        <version>2.3</version>
-
-                        <dependencies>
-                            <!-- put xjc-plugins on the jaxws-maven-plugin's classpath -->
-                            <dependency>
-                                <groupId>org.jvnet.jaxb2_commons</groupId>
-                                <artifactId>jaxb2-basics</artifactId>
-                                <version>0.6.4</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.jvnet.jaxb2_commons</groupId>
-                                <artifactId>jaxb2-value-constructor</artifactId>
-                                <version>3.0</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>wsdl-gen</id>
-                                <goals>
-                                    <goal>wsimport</goal>
-                                </goals>
-                                <configuration>
-                                    <wsdlDirectory>${project.basedir}/src/main/resources/wsdl/</wsdlDirectory>
-                                    <bindingDirectory>${project.basedir}/src/main/resources/schema</bindingDirectory>
-                                    <sourceDestDir>${basedir}/generated-sources/main/java</sourceDestDir>
-                                    <extension>true</extension>
-                                    <target>2.2</target>
-                                    <verbose>true</verbose>
-                                    <!-- tell JAXB to actually use xjc-plugins -->
-                                    <args>
-                                        <arg>-B-Xvalue-constructor</arg>
-                                    </args>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
-
-    <dependencies>
-        <!-- Dependency on the EJB module so we can use it's services if needed -->
-        <dependency>
-            <groupId>ch.puzzle.itc.mobiliar</groupId>
-            <artifactId>AMW_business</artifactId>
-            <type>ejb</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.puzzle.itc.mobiliar</groupId>
-            <artifactId>AMW_business</artifactId>
-            <version>1.17.3-SNAPSHOT</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.puzzle.itc.mobiliar</groupId>
-            <artifactId>AMW_commons</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Import the EJB API, we use provided scope as the API is included in JBoss AS 7 -->
-        <dependency>
-            <groupId>org.jboss.spec.javax.ejb</groupId>
-            <artifactId>jboss-ejb-api_3.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Import the CDI API, we use provided scope as the API is included in JBoss AS 7 -->
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mailapi</artifactId>
-            <version>1.4.2</version>
-            <scope>provided</scope>
-        </dependency>
-
-
-        <!-- Hibernate dependencies -->
-        <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.0-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-envers</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>dom4j</artifactId>
-                    <groupId>dom4j</groupId>
-                </exclusion>
-            </exclusions>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>dom4j</artifactId>
-                    <groupId>dom4j</groupId>
-                </exclusion>
-            </exclusions>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-artifact</artifactId>
-            <version>3.0.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Test scope dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.weld.se</groupId>
-            <artifactId>weld-se-core</artifactId>
-            <version>1.1.8.Final</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.6</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.197</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.11.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.xml.rpc</artifactId>
-            <version>10.0-b28</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>1.1.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>ch.puzzle.itc.mobiliar</groupId>
+        <artifactId>AMW_parent</artifactId>
+        <version>1.17.3</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <name>AMW_maia_federation</name>
+    <artifactId>AMW_maia_federation</artifactId>
+    <packaging>war</packaging>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>generated-sources/main/java</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webResources>
+                        <resource>
+                            <directory>src/main/webapp</directory>
+                            <filtering>true</filtering>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.9</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${basedir}/generated-sources/main/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>generate</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jvnet.jax-ws-commons</groupId>
+                        <artifactId>jaxws-maven-plugin</artifactId>
+                        <version>2.3</version>
+
+                        <dependencies>
+                            <!-- put xjc-plugins on the jaxws-maven-plugin's classpath -->
+                            <dependency>
+                                <groupId>org.jvnet.jaxb2_commons</groupId>
+                                <artifactId>jaxb2-basics</artifactId>
+                                <version>0.6.4</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.jvnet.jaxb2_commons</groupId>
+                                <artifactId>jaxb2-value-constructor</artifactId>
+                                <version>3.0</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>wsdl-gen</id>
+                                <goals>
+                                    <goal>wsimport</goal>
+                                </goals>
+                                <configuration>
+                                    <wsdlDirectory>${project.basedir}/src/main/resources/wsdl/</wsdlDirectory>
+                                    <bindingDirectory>${project.basedir}/src/main/resources/schema</bindingDirectory>
+                                    <sourceDestDir>${basedir}/generated-sources/main/java</sourceDestDir>
+                                    <extension>true</extension>
+                                    <target>2.2</target>
+                                    <verbose>true</verbose>
+                                    <!-- tell JAXB to actually use xjc-plugins -->
+                                    <args>
+                                        <arg>-B-Xvalue-constructor</arg>
+                                    </args>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
+    <dependencies>
+        <!-- Dependency on the EJB module so we can use it's services if needed -->
+        <dependency>
+            <groupId>ch.puzzle.itc.mobiliar</groupId>
+            <artifactId>AMW_business</artifactId>
+            <type>ejb</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.puzzle.itc.mobiliar</groupId>
+            <artifactId>AMW_business</artifactId>
+            <version>1.17.3</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.puzzle.itc.mobiliar</groupId>
+            <artifactId>AMW_commons</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Import the EJB API, we use provided scope as the API is included in JBoss AS 7 -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.ejb</groupId>
+            <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Import the CDI API, we use provided scope as the API is included in JBoss AS 7 -->
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mailapi</artifactId>
+            <version>1.4.2</version>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <!-- Hibernate dependencies -->
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.0-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>dom4j</artifactId>
+                    <groupId>dom4j</groupId>
+                </exclusion>
+            </exclusions>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>dom4j</artifactId>
+                    <groupId>dom4j</groupId>
+                </exclusion>
+            </exclusions>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>3.0.3</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Test scope dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.weld.se</groupId>
+            <artifactId>weld-se-core</artifactId>
+            <version>1.1.8.Final</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.6.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.197</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.11.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.xml.rpc</artifactId>
+            <version>10.0-b28</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <version>1.1.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/AMW_rest/pom.xml b/AMW_rest/pom.xml
index 645b7457a..d2abe254c 100644
--- a/AMW_rest/pom.xml
+++ b/AMW_rest/pom.xml
@@ -1,144 +1,144 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-	<parent>
-		<groupId>ch.puzzle.itc.mobiliar</groupId>
-		<artifactId>AMW_parent</artifactId>
-		<version>1.17.3-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<name>AMW_rest</name>
-	<artifactId>AMW_rest</artifactId>
-	<packaging>war</packaging>
-
-	<properties>
-		<version.swagger-ui>3.16.0</version.swagger-ui>
-	</properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>com.googlecode.maven-download-plugin</groupId>
-					<artifactId>download-maven-plugin</artifactId>
-					<version>1.4.0</version>
-					<executions>
-						<execution>
-							<phase>process-resources</phase>
-							<goals>
-								<goal>wget</goal>
-							</goals>
-							<configuration>
-								<url>https://github.com/swagger-api/swagger-ui/archive/v${version.swagger-ui}.tar.gz</url>
-								<unpack>true</unpack>
-								<outputDirectory>${project.build.directory}</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-war-plugin</artifactId>
-					<version>2.6</version>
-					<configuration>
-						<warName>${project.build.finalName}</warName>
-						<webappDirectory>${basedir}/target/${project.build.finalName}</webappDirectory>
-						<webResources>
-							<webResource>
-								<directory>${project.build.directory}/swagger-ui-${version.swagger-ui}/dist</directory>
-								<filtering>true</filtering>
-								<excludes>
-									<exclude>index.html</exclude>
-								</excludes>
-								<targetPath>/</targetPath>
-							</webResource>
-						</webResources>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>com.googlecode.maven-download-plugin</groupId>
-				<artifactId>download-maven-plugin</artifactId>
-				<version>1.4.0</version>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<!-- Dependency on the EJB module so we can use it's services if needed -->
-		<dependency>
-			<groupId>ch.puzzle.itc.mobiliar</groupId>
-			<artifactId>AMW_business</artifactId>
-			<type>ejb</type>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>ch.puzzle.itc.mobiliar</groupId>
-			<artifactId>AMW_commons</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>jaxrs-api</artifactId>
-			<version>3.0.11.Final</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.0-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-core</artifactId>
-			<version>1.5.20</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>io.swagger</groupId>
-			<artifactId>swagger-jaxrs</artifactId>
-			<version>1.5.20</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.openejb</groupId>
-			<artifactId>javaee-api</artifactId>
-			<version>6.0-6</version>
-			<scope>compile</scope>
-		</dependency>
-		<!-- Concrete implementation needed for tests  -->
-		<dependency>
-			<groupId>com.sun.jersey</groupId>
-			<artifactId>jersey-bundle</artifactId>
-			<version>1.17.1</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<parent>
+		<groupId>ch.puzzle.itc.mobiliar</groupId>
+		<artifactId>AMW_parent</artifactId>
+		<version>1.17.3</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<name>AMW_rest</name>
+	<artifactId>AMW_rest</artifactId>
+	<packaging>war</packaging>
+
+	<properties>
+		<version.swagger-ui>3.16.0</version.swagger-ui>
+	</properties>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>com.googlecode.maven-download-plugin</groupId>
+					<artifactId>download-maven-plugin</artifactId>
+					<version>1.4.0</version>
+					<executions>
+						<execution>
+							<phase>process-resources</phase>
+							<goals>
+								<goal>wget</goal>
+							</goals>
+							<configuration>
+								<url>https://github.com/swagger-api/swagger-ui/archive/v${version.swagger-ui}.tar.gz</url>
+								<unpack>true</unpack>
+								<outputDirectory>${project.build.directory}</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-war-plugin</artifactId>
+					<version>2.6</version>
+					<configuration>
+						<warName>${project.build.finalName}</warName>
+						<webappDirectory>${basedir}/target/${project.build.finalName}</webappDirectory>
+						<webResources>
+							<webResource>
+								<directory>${project.build.directory}/swagger-ui-${version.swagger-ui}/dist</directory>
+								<filtering>true</filtering>
+								<excludes>
+									<exclude>index.html</exclude>
+								</excludes>
+								<targetPath>/</targetPath>
+							</webResource>
+						</webResources>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>com.googlecode.maven-download-plugin</groupId>
+				<artifactId>download-maven-plugin</artifactId>
+				<version>1.4.0</version>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<!-- Dependency on the EJB module so we can use it's services if needed -->
+		<dependency>
+			<groupId>ch.puzzle.itc.mobiliar</groupId>
+			<artifactId>AMW_business</artifactId>
+			<type>ejb</type>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>ch.puzzle.itc.mobiliar</groupId>
+			<artifactId>AMW_commons</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>jaxrs-api</artifactId>
+			<version>3.0.11.Final</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hibernate.javax.persistence</groupId>
+			<artifactId>hibernate-jpa-2.0-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-core</artifactId>
+			<version>1.5.20</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-jaxrs</artifactId>
+			<version>1.5.20</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.openejb</groupId>
+			<artifactId>javaee-api</artifactId>
+			<version>6.0-6</version>
+			<scope>compile</scope>
+		</dependency>
+		<!-- Concrete implementation needed for tests  -->
+		<dependency>
+			<groupId>com.sun.jersey</groupId>
+			<artifactId>jersey-bundle</artifactId>
+			<version>1.17.1</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
 </project>
\ No newline at end of file
diff --git a/AMW_web/pom.xml b/AMW_web/pom.xml
index b2afa0cda..2abd42118 100644
--- a/AMW_web/pom.xml
+++ b/AMW_web/pom.xml
@@ -1,97 +1,97 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>ch.puzzle.itc.mobiliar</groupId>
-        <artifactId>AMW_parent</artifactId>
-        <version>1.17.3-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>AMW_web</artifactId>
-    <packaging>war</packaging>
-    <name>AMW_web</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <packagingExcludes>resources/bower/codemirror/src/</packagingExcludes>
-                    <webResources>
-                        <resource>
-                            <directory>src/main/webapp</directory>
-                            <filtering>true</filtering>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <!-- Dependency on the EJB module so we can use it's services if needed -->
-        <dependency>
-            <groupId>ch.puzzle.itc.mobiliar</groupId>
-            <artifactId>AMW_business</artifactId>
-            <type>ejb</type>
-            <scope>provided</scope>
-        </dependency>
-
-
-        <!-- Import the JAX-RS API, we use provided scope as the API is included
-            in JBoss AS 7 -->
-        <dependency>
-            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Import the CDI API, we use provided scope as the API is included in
-            JBoss AS 7 -->
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Import the JPA API, we use provided scope as the API is included in
-            JBoss AS 7 -->
-        <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.0-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-            <version>1.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.richfaces</groupId>
-            <artifactId>richfaces</artifactId>
-            <version>4.5.10.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.puzzle.itc.mobiliar</groupId>
-            <artifactId>AMW_commons</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>6.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>ch.puzzle.itc.mobiliar</groupId>
+        <artifactId>AMW_parent</artifactId>
+        <version>1.17.3</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>AMW_web</artifactId>
+    <packaging>war</packaging>
+    <name>AMW_web</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <packagingExcludes>resources/bower/codemirror/src/</packagingExcludes>
+                    <webResources>
+                        <resource>
+                            <directory>src/main/webapp</directory>
+                            <filtering>true</filtering>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <!-- Dependency on the EJB module so we can use it's services if needed -->
+        <dependency>
+            <groupId>ch.puzzle.itc.mobiliar</groupId>
+            <artifactId>AMW_business</artifactId>
+            <type>ejb</type>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <!-- Import the JAX-RS API, we use provided scope as the API is included
+            in JBoss AS 7 -->
+        <dependency>
+            <groupId>org.jboss.spec.javax.ws.rs</groupId>
+            <artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Import the CDI API, we use provided scope as the API is included in
+            JBoss AS 7 -->
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Import the JPA API, we use provided scope as the API is included in
+            JBoss AS 7 -->
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.0-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.richfaces</groupId>
+            <artifactId>richfaces</artifactId>
+            <version>4.5.10.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.puzzle.itc.mobiliar</groupId>
+            <artifactId>AMW_commons</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-api</artifactId>
+            <version>6.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9dafdbf9d..411e60a8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,410 +1,410 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>ch.puzzle.itc.mobiliar</groupId>
-    <artifactId>AMW_parent</artifactId>
-    <name>AMW_parent</name>
-    <version>1.17.3-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!-- Define the version of JBoss' Java EE 6 APIs we want to import. Any
-            dependencies from org.jboss.spec will have their version defined by this
-            BOM -->
-        <javaee6.web.spec.version>2.0.0.Final</javaee6.web.spec.version>
-        <!-- Alternatively, you can use version 3.0.0.Beta1-redhat-1 which is a
-            release certified to work with JBoss EAP 6. It requires you have access to
-            the JBoss EAP 6 maven repository. <javaee6.web.spec.version>3.0.0.Beta1-redhat-1</javaee6.web.spec.version> -->
-        <!-- JBoss AS Version (used for arquillion) -->
-        <jboss-as-version>7.1.1.Final</jboss-as-version>
-
-        <sonar.language>java</sonar.language>
-
-        <build.timestamp>${maven.build.timestamp}</build.timestamp>
-        <!-- buildNumber is used in xhtml files for client side caching -->
-        <buildNumber>${maven.build.timestamp}</buildNumber>
-        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-        <!-- **************** -->
-        <!-- Plugins versions -->
-        <!-- **************** -->
-        <version.ear.plugin>2.9.1</version.ear.plugin>
-        <version.ejb.plugin>2.3</version.ejb.plugin>
-        <version.jar.plugin>2.5</version.jar.plugin>
-        <version.war.plugin>2.4</version.war.plugin>
-        <version.jacoco.maven.plugin>0.7.4.201502262128</version.jacoco.maven.plugin>
-        <version.deploy.maven.plugin>2.8.2</version.deploy.maven.plugin>
-        <version.source.maven.plugin>2.4</version.source.maven.plugin>
-        <version.javadoc.maven.plugin>2.10.1</version.javadoc.maven.plugin>
-
-        <version.liquibase>3.5.3</version.liquibase>
-        <version.liquibase-slf4j>1.2.1</version.liquibase-slf4j>
-        <version.assertj-core>2.4.1</version.assertj-core>
-        <version.java>1.7</version.java>
-    </properties>
-
-
-    <modules>
-        <module>AMW_business</module>
-        <module>AMW_commons</module>
-        <module>AMW_ear</module>
-        <module>AMW_web</module>
-        <module>AMW_angular</module>
-        <module>AMW_rest</module>
-        <module>AMW_maia_federation</module>
-        <module>AMW_db_scripts</module>
-    </modules>
-
-    <repositories>
-        <repository>
-            <id>central</id>
-            <name>Maven Central Repository Europe</name>
-            <url>http://uk.maven.org/maven2</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.1</version>
-                    <configuration>
-                        <skip>true</skip>
-                        <skipDeploy>true</skipDeploy>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
-                    <configuration>
-                        <preparationGoals>clean install</preparationGoals>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                        <tagNameFormat>v@{project.version}</tagNameFormat>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.2</version>
-                    <configuration>
-                        <source>${version.java}</source>
-                        <target>${version.java}</target>
-                        <encoding>UTF-8</encoding>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>${version.jar.plugin}</version>
-                    <configuration>
-                        <archive>
-                            <index>true</index>
-                            <manifest>
-                                <addDefaultSpecificationEntries>
-                                    true
-                                </addDefaultSpecificationEntries>
-                                <addDefaultImplementationEntries>
-                                    true
-                                </addDefaultImplementationEntries>
-                            </manifest>
-                            <manifestEntries>
-                                <Java-Version>${java.version}</Java-Version>
-                                <Java-Vendor>${java.vendor}</Java-Vendor>
-                                <Os-Name>${os.name}</Os-Name>
-                                <Os-Arch>${os.arch}</Os-Arch>
-                                <Os-Version>${os.version}</Os-Version>
-                                <Build-Timestamp>${build.timestamp}</Build-Timestamp>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>${version.war.plugin}</version>
-                    <configuration>
-                        <archive>
-                            <manifest>
-                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-ejb-plugin</artifactId>
-                    <version>${version.ejb.plugin}</version>
-                    <configuration>
-                        <!-- Tell Maven we are using EJB 3.1 -->
-                        <ejbVersion>3.1</ejbVersion>
-                        <archive>
-                            <index>true</index>
-                            <manifest>
-                                <addDefaultSpecificationEntries>
-                                    true
-                                </addDefaultSpecificationEntries>
-                                <addDefaultImplementationEntries>
-                                    true
-                                </addDefaultImplementationEntries>
-                            </manifest>
-                            <manifestEntries>
-                                <Java-Version>${java.version}</Java-Version>
-                                <Java-Vendor>${java.vendor}</Java-Vendor>
-                                <Os-Name>${os.name}</Os-Name>
-                                <Os-Arch>${os.arch}</Os-Arch>
-                                <Os-Version>${os.version}</Os-Version>
-                                <Build-Timestamp>${build.timestamp}</Build-Timestamp>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-ear-plugin</artifactId>
-                    <version>${version.ear.plugin}</version>
-                    <configuration>
-                        <archive>
-                            <manifest>
-                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                            </manifest>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <!-- The JBoss AS plugin deploys your ear to a local JBoss AS container -->
-                <!-- Due to Maven's lack of intelligence with EARs we need to configure
-                    the jboss-as maven plugin to skip deployment for all modules. We then enable
-                    it specifically in the ear module. -->
-                <plugin>
-                    <groupId>org.jboss.as.plugins</groupId>
-                    <artifactId>jboss-as-maven-plugin</artifactId>
-                    <version>${jboss-as-version}</version>
-                    <inherited>true</inherited>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-                <!-- the following plugins are used by maven-release-plugin -->
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>${version.deploy.maven.plugin}</version>
-                    <configuration>
-                        <altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>${version.source.maven.plugin}</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>${version.javadoc.maven.plugin}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>${version.jacoco.maven.plugin}</version>
-                    <executions>
-                        <execution>
-                            <id>default-prepare-agent</id>
-                            <goals>
-                                <goal>prepare-agent</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>default-report</id>
-                            <phase>prepare-package</phase>
-                            <goals>
-                                <goal>report</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>default-check</id>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-		<plugin>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-surefire-plugin</artifactId>
-		    <configuration>
-			<forkCount>1</forkCount>
-			<reuseForks>true</reuseForks>
-			<argLine>-Xmx2048m -XX:MaxPermSize=256m</argLine>
-		    </configuration>
-		</plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <!-- URL to Git repository used by maven-release-plugin -->
-    <scm>
-        <developerConnection>scm:git:https://github.com/a-gogo/agogo.git</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
-
-    <distributionManagement>
-        <repository>
-            <id>internal.repo</id>
-            <name>Temporary Repository</name>
-            <url>file://${project.build.directory}/mvn-repo</url>
-        </repository>
-    </distributionManagement>
-
-    <dependencyManagement>
-        <dependencies>
-
-            <dependency>
-                <groupId>ch.puzzle.itc.mobiliar</groupId>
-                <artifactId>AMW_business</artifactId>
-                <version>1.17.3-SNAPSHOT</version>
-                <type>ejb</type>
-            </dependency>
-
-            <dependency>
-                <groupId>ch.puzzle.itc.mobiliar</groupId>
-                <artifactId>AMW_commons</artifactId>
-                <version>1.17.3-SNAPSHOT</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>ch.puzzle.itc.mobiliar</groupId>
-                <artifactId>AMW_web</artifactId>
-                <version>1.17.3-SNAPSHOT</version>
-                <type>war</type>
-                <scope>compile</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>ch.puzzle.itc.mobiliar</groupId>
-                <artifactId>AMW_angular</artifactId>
-                <version>1.17.3-SNAPSHOT</version>
-                <type>war</type>
-                <scope>compile</scope>
-            </dependency>
-
-
-            <dependency>
-                <groupId>ch.puzzle.itc.mobiliar</groupId>
-                <artifactId>AMW_rest</artifactId>
-                <version>1.17.3-SNAPSHOT</version>
-                <type>war</type>
-                <scope>compile</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>ch.puzzle.itc.mobiliar</groupId>
-                <artifactId>AMW_maia_federation</artifactId>
-                <version>1.17.3-SNAPSHOT</version>
-                <type>war</type>
-                <scope>compile</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>1.18.0</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <!-- JBoss distributes a complete set of Java EE 6 APIs including a Bill
-                of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
-                of artifacts. We use this here so that we always get the correct versions
-                of artifacts. Here we use the jboss-javaee-web-6.0 stack (you can read this
-                as the JBoss stack of the Java EE Web Profile 6 APIs) -->
-            <dependency>
-                <groupId>org.jboss.spec</groupId>
-                <artifactId>jboss-javaee-web-6.0</artifactId>
-                <version>${javaee6.web.spec.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <!-- JSR-303 (Bean Validation) Implementation -->
-            <!-- Provides portable constraints such as @Email -->
-            <!-- Hibernate Validator is shipped in JBoss AS 7 -->
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-validator</artifactId>
-                <version>4.3.1.Final</version>
-                <scope>provided</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-core</artifactId>
-                <version>4.2.14.Final</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>dom4j</artifactId>
-                        <groupId>dom4j</groupId>
-                    </exclusion>
-                </exclusions>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-envers</artifactId>
-                <version>4.2.14.Final</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>dom4j</artifactId>
-                        <groupId>dom4j</groupId>
-                    </exclusion>
-                </exclusions>
-                <scope>provided</scope>
-            </dependency>
-
-            <!-- Test dependencies -->
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.11</version>
-                <type>jar</type>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
-                <version>1.9.5</version>
-                <scope>test</scope>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>org.assertj</groupId>
-                <artifactId>assertj-core</artifactId>
-                <version>${version.assertj-core}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>com.google.code.gson</groupId>
-                <artifactId>gson</artifactId>
-                <version>2.2.4</version>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-    </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>ch.puzzle.itc.mobiliar</groupId>
+    <artifactId>AMW_parent</artifactId>
+    <name>AMW_parent</name>
+    <version>1.17.3</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Define the version of JBoss' Java EE 6 APIs we want to import. Any
+            dependencies from org.jboss.spec will have their version defined by this
+            BOM -->
+        <javaee6.web.spec.version>2.0.0.Final</javaee6.web.spec.version>
+        <!-- Alternatively, you can use version 3.0.0.Beta1-redhat-1 which is a
+            release certified to work with JBoss EAP 6. It requires you have access to
+            the JBoss EAP 6 maven repository. <javaee6.web.spec.version>3.0.0.Beta1-redhat-1</javaee6.web.spec.version> -->
+        <!-- JBoss AS Version (used for arquillion) -->
+        <jboss-as-version>7.1.1.Final</jboss-as-version>
+
+        <sonar.language>java</sonar.language>
+
+        <build.timestamp>${maven.build.timestamp}</build.timestamp>
+        <!-- buildNumber is used in xhtml files for client side caching -->
+        <buildNumber>${maven.build.timestamp}</buildNumber>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+        <!-- **************** -->
+        <!-- Plugins versions -->
+        <!-- **************** -->
+        <version.ear.plugin>2.9.1</version.ear.plugin>
+        <version.ejb.plugin>2.3</version.ejb.plugin>
+        <version.jar.plugin>2.5</version.jar.plugin>
+        <version.war.plugin>2.4</version.war.plugin>
+        <version.jacoco.maven.plugin>0.7.4.201502262128</version.jacoco.maven.plugin>
+        <version.deploy.maven.plugin>2.8.2</version.deploy.maven.plugin>
+        <version.source.maven.plugin>2.4</version.source.maven.plugin>
+        <version.javadoc.maven.plugin>2.10.1</version.javadoc.maven.plugin>
+
+        <version.liquibase>3.5.3</version.liquibase>
+        <version.liquibase-slf4j>1.2.1</version.liquibase-slf4j>
+        <version.assertj-core>2.4.1</version.assertj-core>
+        <version.java>1.7</version.java>
+    </properties>
+
+
+    <modules>
+        <module>AMW_business</module>
+        <module>AMW_commons</module>
+        <module>AMW_ear</module>
+        <module>AMW_web</module>
+        <module>AMW_angular</module>
+        <module>AMW_rest</module>
+        <module>AMW_maia_federation</module>
+        <module>AMW_db_scripts</module>
+    </modules>
+
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Maven Central Repository Europe</name>
+            <url>http://uk.maven.org/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.1</version>
+                    <configuration>
+                        <skip>true</skip>
+                        <skipDeploy>true</skipDeploy>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.3</version>
+                    <configuration>
+                        <preparationGoals>clean install</preparationGoals>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                        <tagNameFormat>v@{project.version}</tagNameFormat>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.2</version>
+                    <configuration>
+                        <source>${version.java}</source>
+                        <target>${version.java}</target>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${version.jar.plugin}</version>
+                    <configuration>
+                        <archive>
+                            <index>true</index>
+                            <manifest>
+                                <addDefaultSpecificationEntries>
+                                    true
+                                </addDefaultSpecificationEntries>
+                                <addDefaultImplementationEntries>
+                                    true
+                                </addDefaultImplementationEntries>
+                            </manifest>
+                            <manifestEntries>
+                                <Java-Version>${java.version}</Java-Version>
+                                <Java-Vendor>${java.vendor}</Java-Vendor>
+                                <Os-Name>${os.name}</Os-Name>
+                                <Os-Arch>${os.arch}</Os-Arch>
+                                <Os-Version>${os.version}</Os-Version>
+                                <Build-Timestamp>${build.timestamp}</Build-Timestamp>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${version.war.plugin}</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-ejb-plugin</artifactId>
+                    <version>${version.ejb.plugin}</version>
+                    <configuration>
+                        <!-- Tell Maven we are using EJB 3.1 -->
+                        <ejbVersion>3.1</ejbVersion>
+                        <archive>
+                            <index>true</index>
+                            <manifest>
+                                <addDefaultSpecificationEntries>
+                                    true
+                                </addDefaultSpecificationEntries>
+                                <addDefaultImplementationEntries>
+                                    true
+                                </addDefaultImplementationEntries>
+                            </manifest>
+                            <manifestEntries>
+                                <Java-Version>${java.version}</Java-Version>
+                                <Java-Vendor>${java.vendor}</Java-Vendor>
+                                <Os-Name>${os.name}</Os-Name>
+                                <Os-Arch>${os.arch}</Os-Arch>
+                                <Os-Version>${os.version}</Os-Version>
+                                <Build-Timestamp>${build.timestamp}</Build-Timestamp>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-ear-plugin</artifactId>
+                    <version>${version.ear.plugin}</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <!-- The JBoss AS plugin deploys your ear to a local JBoss AS container -->
+                <!-- Due to Maven's lack of intelligence with EARs we need to configure
+                    the jboss-as maven plugin to skip deployment for all modules. We then enable
+                    it specifically in the ear module. -->
+                <plugin>
+                    <groupId>org.jboss.as.plugins</groupId>
+                    <artifactId>jboss-as-maven-plugin</artifactId>
+                    <version>${jboss-as-version}</version>
+                    <inherited>true</inherited>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                </plugin>
+                <!-- the following plugins are used by maven-release-plugin -->
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>${version.deploy.maven.plugin}</version>
+                    <configuration>
+                        <altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>${version.source.maven.plugin}</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${version.javadoc.maven.plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>${version.jacoco.maven.plugin}</version>
+                    <executions>
+                        <execution>
+                            <id>default-prepare-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>default-report</id>
+                            <phase>prepare-package</phase>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>default-check</id>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+		<plugin>
+		    <groupId>org.apache.maven.plugins</groupId>
+		    <artifactId>maven-surefire-plugin</artifactId>
+		    <configuration>
+			<forkCount>1</forkCount>
+			<reuseForks>true</reuseForks>
+			<argLine>-Xmx2048m -XX:MaxPermSize=256m</argLine>
+		    </configuration>
+		</plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <!-- URL to Git repository used by maven-release-plugin -->
+    <scm>
+        <developerConnection>scm:git:https://github.com/a-gogo/agogo.git</developerConnection>
+        <tag>v1.17.3</tag>
+    </scm>
+
+    <distributionManagement>
+        <repository>
+            <id>internal.repo</id>
+            <name>Temporary Repository</name>
+            <url>file://${project.build.directory}/mvn-repo</url>
+        </repository>
+    </distributionManagement>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>ch.puzzle.itc.mobiliar</groupId>
+                <artifactId>AMW_business</artifactId>
+                <version>1.17.3</version>
+                <type>ejb</type>
+            </dependency>
+
+            <dependency>
+                <groupId>ch.puzzle.itc.mobiliar</groupId>
+                <artifactId>AMW_commons</artifactId>
+                <version>1.17.3</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>ch.puzzle.itc.mobiliar</groupId>
+                <artifactId>AMW_web</artifactId>
+                <version>1.17.3</version>
+                <type>war</type>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>ch.puzzle.itc.mobiliar</groupId>
+                <artifactId>AMW_angular</artifactId>
+                <version>1.17.3</version>
+                <type>war</type>
+                <scope>compile</scope>
+            </dependency>
+
+
+            <dependency>
+                <groupId>ch.puzzle.itc.mobiliar</groupId>
+                <artifactId>AMW_rest</artifactId>
+                <version>1.17.3</version>
+                <type>war</type>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>ch.puzzle.itc.mobiliar</groupId>
+                <artifactId>AMW_maia_federation</artifactId>
+                <version>1.17.3</version>
+                <type>war</type>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.0</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <!-- JBoss distributes a complete set of Java EE 6 APIs including a Bill
+                of Materials (BOM). A BOM specifies the versions of a "stack" (or a collection)
+                of artifacts. We use this here so that we always get the correct versions
+                of artifacts. Here we use the jboss-javaee-web-6.0 stack (you can read this
+                as the JBoss stack of the Java EE Web Profile 6 APIs) -->
+            <dependency>
+                <groupId>org.jboss.spec</groupId>
+                <artifactId>jboss-javaee-web-6.0</artifactId>
+                <version>${javaee6.web.spec.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- JSR-303 (Bean Validation) Implementation -->
+            <!-- Provides portable constraints such as @Email -->
+            <!-- Hibernate Validator is shipped in JBoss AS 7 -->
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-validator</artifactId>
+                <version>4.3.1.Final</version>
+                <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-core</artifactId>
+                <version>4.2.14.Final</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>dom4j</artifactId>
+                        <groupId>dom4j</groupId>
+                    </exclusion>
+                </exclusions>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-envers</artifactId>
+                <version>4.2.14.Final</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>dom4j</artifactId>
+                        <groupId>dom4j</groupId>
+                    </exclusion>
+                </exclusions>
+                <scope>provided</scope>
+            </dependency>
+
+            <!-- Test dependencies -->
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.11</version>
+                <type>jar</type>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>1.9.5</version>
+                <scope>test</scope>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>${version.assertj-core}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>2.2.4</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
+</project>