diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml
index 03a281893..24f6b7177 100644
--- a/ccm-bundle-devel-wildfly/pom.xml
+++ b/ccm-bundle-devel-wildfly/pom.xml
@@ -6,6 +6,7 @@
     
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <wildfly.version>10.0.0.Final</wildfly.version>
     </properties>
     
     <modelVersion>4.0.0</modelVersion>
@@ -34,7 +35,7 @@
     </dependencies>
     
     <build>
-        <finalName>libreccm-devel-7.0.0-SNAPSHOT</finalName>
+        <finalName>libreccm-devel-${project.version}</finalName>
         
         <plugins>
             <plugin>
@@ -44,7 +45,8 @@
                     <!-- Tell Maven we are using Java EE 7 -->
                     <version>7</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 
+                    are an easy way to package any libraries needed in the ear, 
+                    and automatically 
                     have any modules (EJB-JARs and WARs) use them -->
                     <defaultLibBundleDir>lib</defaultLibBundleDir>
                     <fileNameMapping>no-version</fileNameMapping>
@@ -61,7 +63,13 @@
         </plugins>
     </build>
 
+    <!-- Profiles for running the bundle in a development environment -->
     <profiles>
+        
+        <!-- Profile which uses a H2 database. The DB file is put into the
+            project build directory and therefore deleted when the clean phase
+            runs.
+        -->
         <profile>
             <id>h2</id>
             
@@ -72,7 +80,7 @@
                         <artifactId>wildfly-maven-plugin</artifactId>
                         
                         <configuration>
-                            <version>10.0.0.Final</version>
+                            <version>${wildfly.version}</version>
                             
                             <skip>false</skip>
 
@@ -98,6 +106,13 @@
             </build>
         </profile>
         
+        <!-- 
+            Profile which uses a PostgreSQL datasource with a generic 
+            configuration. When using this profile PostgreSQL must run on the
+            local system and a database with the name "libreccm-devel" which
+            is accessible by the user "ccm" with the password "ccm47web" must
+            exist.
+        -->
         <profile>
             <id>pgsql</id>
             
@@ -116,7 +131,7 @@
                         <artifactId>wildfly-maven-plugin</artifactId>
                         
                         <configuration>
-                            <version>10.0.0.Final</version>
+                            <version>${wildfly.version}</version>
                             
                             <skip>false</skip>
                             
@@ -131,7 +146,8 @@
                             
                             <beforeDeployment>
                                 <commands>
-                                    <command>module add --name=org.postgres --resources=resources/postgresql-9.4.1208.jar --dependencies=javax.api,javax.transaction.api</command>
+                                    <!--jdbc-drivers/postgresql-9.4.1208.jar-->
+                                    <command>module add --name=org.postgres --resources=${project.build.directory}/${project.build.finalName}/lib/postgresql.jar --dependencies=javax.api,javax.transaction.api</command>
                                     <command>/subsystem=datasources/jdbc-driver=postgres:add(driver-name="postgres",driver-module-name="org.postgres",driver-class-name=org.postgresql.Driver)</command>
                                     <command>data-source add --jndi-name=java:/comp/env/jdbc/libreccm/db --name=libreccm-devel --connection-url=jdbc:postgresql://localhost:5432/libreccm-devel --driver-name=postgres --driver-class=org.postgresql.Driver --user-name=ccm --password=ccm47web</command>
                                 </commands>
@@ -143,6 +159,34 @@
                 </plugins>
             </build>
         </profile>
+        
+        <!-- 
+            Generic profile for using an existing Wildfly installation. 
+            The datasource for CCM must be configured in the Wildfly instance.
+            Also the plugin must know where the wildfly installation is. This 
+            can either be done by setting the JBOSS_HOME environment variable or
+            by providing the location using -Djboss-as.home=/path/to/wildfly
+            on the command line.
+        -->
+        <profile>
+            <id>generic</id>
+            
+            <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.wildfly.plugins</groupId>
+                        <artifactId>wildfly-maven-plugin</artifactId>
+                        
+                        <configuration>
+                            <version>${wildfly.version}</version>
+                            
+                            <skip>false</skip>
+                        </configuration>
+                </plugin>
+            </plugins>
+            </build>
+            
+        </profile>
     </profiles>
 
 </project>
diff --git a/ccm-bundle-devel-wildfly/src/site/apt/index.apt b/ccm-bundle-devel-wildfly/src/site/apt/index.apt
index 53e0853d3..036941f52 100644
--- a/ccm-bundle-devel-wildfly/src/site/apt/index.apt
+++ b/ccm-bundle-devel-wildfly/src/site/apt/index.apt
@@ -3,11 +3,57 @@
             --------------
             Jens Pelzetter
             --------------
-              2016-03-18
+              2016-06-03
             --------------
 
 LibreCCM Bundle for Wildfly
 
-    This module provides the LibreCCM devel bundle for the Wildfly application 
-    server.
+    This module provides the LibreCCM development bundle for the Wildfly 
+    application server. 
 
+    This bundle is not meant for production use as its contains most of the
+    available modules. 
+
+    Developers can run this LibreCCM directly from Maven. Three profiles are
+    provided:
+
+    [h2] Uses a H2 database located in the project build directory. This means
+    that the database is deleted every time <<<mvn clean>>>.
+    
+    [pgsql] Uses an PostgresSQL database with a generic configuration. The
+      PostgreSQL server must run on localhost and the standard port and there
+      must be a database called with <<<libreccm-devel>>> which is accessible 
+      for the user <<<ccm>>> using the password <<<ccm47web>>>.
+
+    [generic] Uses an existing Wildfly installation. The datasource for the 
+    database which is used by LibreCCM has to be configured by the user for this
+    profile. Also, Maven or more exactly the wildfly-maven-plugin has to know
+    the location of the Wildfly instance to use. The location of the Wildfly 
+    instance can either be provided on the command line when invoking Maven 
+    or by setting the <<<JBOSS_HOME>>> environment variable.
+
+    The <<<h2>>> and the <<<pgsql>>> profile add a user to the Wildfly server
+    with the username <<<admin>>> and the password <<<admin123>>> which allow 
+    the developer to access the management web UI of the Wildfly server.
+
+* Run examples
+
+    ** Profile h2
+
+    To run the LibreCCM bundle using a H2 database:
+    
+    mvn package wildfly:run -pl ccm-bundle-devel-wildfly -am -Ph2
+
+    ** Profile pgsql
+
+     mvn package wildfly:run -pl ccm-bundle-devel-wildfly -am -Ppgsql
+
+    ** Profile generic
+
+    mvn -Djboss-as.home=/home/jensp/java-ee-servers/wildfly/wildfly-10.0.0.Final_ccm-runtime package wildfly:run -pl ccm-bundle-devel-wildfly -am -Pgeneric
+
+    ** Additional options
+
+    The <<<wildfly:run>>> goad of the <wildfly-maven-plugin> provides several 
+    other options. For a complete list please refer to the documentation of the
+    {{{https://docs.jboss.org/wildfly/plugins/maven/latest/run-mojo.html}run goal}}.
\ No newline at end of file
diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml
index 6a6314f09..0a883ae21 100644
--- a/ccm-cms-types-agenda/pom.xml
+++ b/ccm-cms-types-agenda/pom.xml
@@ -47,12 +47,26 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         
         <dependency>
             <groupId>junit</groupId>
diff --git a/ccm-cms-types-article/pom.xml b/ccm-cms-types-article/pom.xml
index 37ee47079..5a6f296b2 100644
--- a/ccm-cms-types-article/pom.xml
+++ b/ccm-cms-types-article/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-    <artifactId>libreccm-parent</artifactId>
-    <groupId>org.libreccm</groupId>
-    <version>7.0.0-SNAPSHOT</version>
-  </parent>
+        <artifactId>libreccm-parent</artifactId>
+        <groupId>org.libreccm</groupId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
  
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -46,12 +46,26 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         
         <dependency>
             <groupId>junit</groupId>
@@ -138,7 +152,7 @@
                 </configuration>
             </plugin>
 
-             <plugin>
+            <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
@@ -310,7 +324,7 @@
                     <reportSet>
                         <reports>
                             <report>dependencies</report>
-                           <report>license</report>
+                            <report>license</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml
index 7bf574fb6..8c0d98a97 100644
--- a/ccm-cms-types-bookmark/pom.xml
+++ b/ccm-cms-types-bookmark/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-    <artifactId>libreccm-parent</artifactId>
-    <groupId>org.libreccm</groupId>
-    <version>7.0.0-SNAPSHOT</version>
-  </parent>
+        <artifactId>libreccm-parent</artifactId>
+        <groupId>org.libreccm</groupId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
  
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,11 +47,24 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -139,7 +152,7 @@
                 </configuration>
             </plugin>
 
-             <plugin>
+            <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
@@ -311,7 +324,7 @@
                     <reportSet>
                         <reports>
                             <report>dependencies</report>
-                           <report>license</report>
+                            <report>license</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml
index da7ba33f8..c12b09ea2 100644
--- a/ccm-cms-types-decisiontree/pom.xml
+++ b/ccm-cms-types-decisiontree/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-    <artifactId>libreccm-parent</artifactId>
-    <groupId>org.libreccm</groupId>
-    <version>7.0.0-SNAPSHOT</version>
-  </parent>
+        <artifactId>libreccm-parent</artifactId>
+        <groupId>org.libreccm</groupId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
  
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,12 +47,26 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         
         <dependency>
             <groupId>junit</groupId>
@@ -139,7 +153,7 @@
                 </configuration>
             </plugin>
 
-             <plugin>
+            <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
@@ -311,7 +325,7 @@
                     <reportSet>
                         <reports>
                             <report>dependencies</report>
-                           <report>license</report>
+                            <report>license</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/ccm-cms-types-event/pom.xml b/ccm-cms-types-event/pom.xml
index b8b54c9f9..83a76973f 100644
--- a/ccm-cms-types-event/pom.xml
+++ b/ccm-cms-types-event/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-    <artifactId>libreccm-parent</artifactId>
-    <groupId>org.libreccm</groupId>
-    <version>7.0.0-SNAPSHOT</version>
-  </parent>
+        <artifactId>libreccm-parent</artifactId>
+        <groupId>org.libreccm</groupId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
  
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,12 +47,26 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         
         <dependency>
             <groupId>junit</groupId>
@@ -139,7 +153,7 @@
                 </configuration>
             </plugin>
 
-             <plugin>
+            <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
@@ -311,7 +325,7 @@
                     <reportSet>
                         <reports>
                             <report>dependencies</report>
-                           <report>license</report>
+                            <report>license</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml
index d79984bad..12b6c7b7f 100644
--- a/ccm-cms-types-externallink/pom.xml
+++ b/ccm-cms-types-externallink/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-    <artifactId>libreccm-parent</artifactId>
-    <groupId>org.libreccm</groupId>
-    <version>7.0.0-SNAPSHOT</version>
-  </parent>
+        <artifactId>libreccm-parent</artifactId>
+        <groupId>org.libreccm</groupId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
  
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,11 +47,24 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -139,7 +152,7 @@
                 </configuration>
             </plugin>
 
-             <plugin>
+            <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
@@ -312,7 +325,7 @@
                     <reportSet>
                         <reports>
                             <report>dependencies</report>
-                           <report>license</report>
+                            <report>license</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml
index 33fbf3c60..cdc6969d7 100644
--- a/ccm-cms-types-faqitem/pom.xml
+++ b/ccm-cms-types-faqitem/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-    <artifactId>libreccm-parent</artifactId>
-    <groupId>org.libreccm</groupId>
-    <version>7.0.0-SNAPSHOT</version>
-  </parent>
+        <artifactId>libreccm-parent</artifactId>
+        <groupId>org.libreccm</groupId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
  
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,11 +47,24 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -139,7 +152,7 @@
                 </configuration>
             </plugin>
 
-             <plugin>
+            <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
@@ -312,7 +325,7 @@
                     <reportSet>
                         <reports>
                             <report>dependencies</report>
-                           <report>license</report>
+                            <report>license</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml
index 70685b083..315637949 100644
--- a/ccm-cms-types-glossaryitem/pom.xml
+++ b/ccm-cms-types-glossaryitem/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-    <artifactId>libreccm-parent</artifactId>
-    <groupId>org.libreccm</groupId>
-    <version>7.0.0-SNAPSHOT</version>
-  </parent>
+        <artifactId>libreccm-parent</artifactId>
+        <groupId>org.libreccm</groupId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
  
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,11 +47,24 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -139,7 +152,7 @@
                 </configuration>
             </plugin>
 
-             <plugin>
+            <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
@@ -312,7 +325,7 @@
                     <reportSet>
                         <reports>
                             <report>dependencies</report>
-                           <report>license</report>
+                            <report>license</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml
index 60dae1db2..9ebf74c46 100644
--- a/ccm-cms-types-minutes/pom.xml
+++ b/ccm-cms-types-minutes/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-    <artifactId>libreccm-parent</artifactId>
-    <groupId>org.libreccm</groupId>
-    <version>7.0.0-SNAPSHOT</version>
-  </parent>
+        <artifactId>libreccm-parent</artifactId>
+        <groupId>org.libreccm</groupId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
  
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,12 +47,26 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         
         <dependency>
             <groupId>junit</groupId>
@@ -139,7 +153,7 @@
                 </configuration>
             </plugin>
 
-             <plugin>
+            <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
@@ -311,7 +325,7 @@
                     <reportSet>
                         <reports>
                             <report>dependencies</report>
-                           <report>license</report>
+                            <report>license</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/ccm-cms-types-mparticle/pom.xml b/ccm-cms-types-mparticle/pom.xml
index 6db3be871..943cd1c06 100644
--- a/ccm-cms-types-mparticle/pom.xml
+++ b/ccm-cms-types-mparticle/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-    <artifactId>libreccm-parent</artifactId>
-    <groupId>org.libreccm</groupId>
-    <version>7.0.0-SNAPSHOT</version>
-  </parent>
+        <artifactId>libreccm-parent</artifactId>
+        <groupId>org.libreccm</groupId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
  
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,12 +47,26 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         
         <dependency>
             <groupId>junit</groupId>
@@ -139,7 +153,7 @@
                 </configuration>
             </plugin>
 
-             <plugin>
+            <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
@@ -311,7 +325,7 @@
                     <reportSet>
                         <reports>
                             <report>dependencies</report>
-                           <report>license</report>
+                            <report>license</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/ccm-cms-types-newsitem/pom.xml b/ccm-cms-types-newsitem/pom.xml
index d08a3a752..3e90b2c3f 100644
--- a/ccm-cms-types-newsitem/pom.xml
+++ b/ccm-cms-types-newsitem/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-    <artifactId>libreccm-parent</artifactId>
-    <groupId>org.libreccm</groupId>
-    <version>7.0.0-SNAPSHOT</version>
-  </parent>
+        <artifactId>libreccm-parent</artifactId>
+        <groupId>org.libreccm</groupId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
  
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,11 +47,24 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -139,7 +152,7 @@
                 </configuration>
             </plugin>
 
-             <plugin>
+            <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
@@ -312,7 +325,7 @@
                     <reportSet>
                         <reports>
                             <report>dependencies</report>
-                           <report>license</report>
+                            <report>license</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index c11e07811..999a5ebdb 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-    <artifactId>libreccm-parent</artifactId>
-    <groupId>org.libreccm</groupId>
-    <version>7.0.0-SNAPSHOT</version>
-  </parent>
+        <artifactId>libreccm-parent</artifactId>
+        <groupId>org.libreccm</groupId>
+        <version>7.0.0-SNAPSHOT</version>
+    </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,11 +38,24 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -130,7 +143,7 @@
                 </configuration>
             </plugin>
 
-             <plugin>
+            <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
@@ -302,7 +315,7 @@
                     <reportSet>
                         <reports>
                             <report>dependencies</report>
-                           <report>license</report>
+                            <report>license</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/resources/postgresql-9.4.1208.jar b/resources/postgresql-9.4.1208.jar
deleted file mode 100644
index 9858b2786..000000000
Binary files a/resources/postgresql-9.4.1208.jar and /dev/null differ
diff --git a/src/site/apt/building.apt b/src/site/apt/building.apt
index 6093f69b1..56ee3f27b 100644
--- a/src/site/apt/building.apt
+++ b/src/site/apt/building.apt
@@ -23,4 +23,33 @@ Building LibreCCM
 
     [Build or refresh project site] mvn clean site site:stage
 
-    [Create WAR files] ToDo
\ No newline at end of file
+    [Create EAR files] Due to certain limitations and restrictions for WAR files
+    regarding class paths etc. LibreCCM is now deployed as an Enterprise 
+    Archive. There will be several bundles. These are Maven modules which
+    are used to aggregate specific modules. Each bundle consists of two Maven
+    modules: The WAR module which creates the WAR file and the EAR module
+    which creates the final EAR file. The bundle are application server specific
+    and named using the following pattern: 
+    
+-----------------------------------------------
+ccm-bundle-${bundle-name}-${application-server}
+-----------------------------------------------
+
+    Where <<<${bundle-name}>>> is the name of the bundle and 
+    <<<${application-server}>>> is the application server for which the bundle
+    is optimised.
+
+    Because of some subtile differences, for example the JNDI names for
+    data sources, it is necessary to provide bundles for specific application
+    servers. A specific bundle including all its dependencies can be build by 
+    running
+
+---
+mvn package -pl ${bundle} -am
+---
+
+    Replace <<<${bundle}>>> with the name of the bundle to build, for example
+    <<<ccm-bundle-devel-wildfly>>> to build the development bundle for Wildfly. 
+    The <<<-am>>> parameter causes Maven to build are Maven modules required by
+    the bundle before the bundle is build. For specific informations about a
+    bundle please refer to the documentation of the bundle.
\ No newline at end of file
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 5ff4e08d8..b741c16ed 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -12,19 +12,19 @@ LibreCCM
     on Java EE. 
 
     This is the next generation variant of LibreCCM. In this version which
-    currently developed in parallel the current version, several custom APIs
-    like the persistence layer have been replaced with standard APIs from
+    currently developed in parallel with the current version, several custom APIs
+    like the persistence layer have been replaced with standard APIs from the
     Java Community process. 
 
     Please note that this is a project in its early phase of development. Some
     aspects may change without warning.
 
-    The most notable change is the move the JPA as
+    The most notable change is the move to JPA as
     persistence layer. We are using Hibernate as implementation because 
     Hibernate currently provides one important feature which other JPA providers
     do not provide: Versioned or better audited entities. This extension is
     called Envers. Auditing is currently not part the JPA standard therefore
-    we need to use s specific implementation.
+    we need to use a specific implementation.
 
     Another notable change is that the build system is now using
     {{{http://maven.apache.org/}Apache Maven}}. The project is a standard