diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 3f9c3cc5c..33c099f6b 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -42,20 +42,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>
         
         <!--
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UsersGroupsRolesTab.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UsersGroupsRolesTab.java
index 47d30031d..647a7a344 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UsersGroupsRolesTab.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UsersGroupsRolesTab.java
@@ -18,6 +18,7 @@
  */
 package com.arsdigita.ui.admin.usersgroupsroles;
 
+import com.arsdigita.ui.admin.usersgroupsroles.users.UserAdmin;
 import com.arsdigita.bebop.BoxPanel;
 import com.arsdigita.bebop.Component;
 import com.arsdigita.bebop.Label;
@@ -29,6 +30,7 @@ import com.arsdigita.bebop.list.ListModel;
 import com.arsdigita.bebop.list.ListModelBuilder;
 import com.arsdigita.globalization.GlobalizedMessage;
 import com.arsdigita.toolbox.ui.LayoutPanel;
+import com.arsdigita.ui.admin.usersgroupsroles.groups.GroupAdmin;
 import com.arsdigita.util.Assert;
 import com.arsdigita.util.LockableImpl;
 
@@ -63,8 +65,8 @@ public class UsersGroupsRolesTab extends LayoutPanel {
 //        final BoxPanel usersPanel = new BoxPanel();
 //        usersPanel.add(new Label("Users Panel"));
 
-        final BoxPanel groupsPanel = new BoxPanel();
-        groupsPanel.add(new Label("Groups Panel"));
+//        final BoxPanel groupsPanel = new BoxPanel();
+//        groupsPanel.add(new Label("Groups Panel"));
 
         final BoxPanel rolesPanel = new BoxPanel();
         rolesPanel.add(new Label("Roles Panel"));
@@ -80,7 +82,7 @@ public class UsersGroupsRolesTab extends LayoutPanel {
             new Label(new GlobalizedMessage(
                 "ui.admin.users_groups_roles.groups.title",
                 ADMIN_BUNDLE)),
-            groupsPanel,
+            new GroupAdmin(),
             body);
         addSection(
             new Label(new GlobalizedMessage(
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserAdmin.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserAdmin.java
similarity index 99%
rename from ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserAdmin.java
rename to ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserAdmin.java
index 2365c65d0..807ab278c 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserAdmin.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserAdmin.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.ui.admin.usersgroupsroles;
+package com.arsdigita.ui.admin.usersgroupsroles.users;
 
 import com.arsdigita.bebop.ActionLink;
 import com.arsdigita.bebop.BoxPanel;
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserEmailTableModel.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserEmailTableModel.java
similarity index 98%
rename from ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserEmailTableModel.java
rename to ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserEmailTableModel.java
index 97519c9ee..3366948d5 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserEmailTableModel.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserEmailTableModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.ui.admin.usersgroupsroles;
+package com.arsdigita.ui.admin.usersgroupsroles.users;
 
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.table.TableModel;
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserEmailTableModelBuilder.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserEmailTableModelBuilder.java
similarity index 97%
rename from ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserEmailTableModelBuilder.java
rename to ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserEmailTableModelBuilder.java
index 890389360..cf2c34e14 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserEmailTableModelBuilder.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserEmailTableModelBuilder.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.ui.admin.usersgroupsroles;
+package com.arsdigita.ui.admin.usersgroupsroles.users;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.ParameterSingleSelectionModel;
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserGroupsRolesTableModel.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserGroupsRolesTableModel.java
similarity index 99%
rename from ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserGroupsRolesTableModel.java
rename to ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserGroupsRolesTableModel.java
index f317258c3..432344404 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserGroupsRolesTableModel.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserGroupsRolesTableModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.ui.admin.usersgroupsroles;
+package com.arsdigita.ui.admin.usersgroupsroles.users;
 
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.table.TableModel;
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserGroupsRolesTableModelBuilder.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserGroupsRolesTableModelBuilder.java
similarity index 97%
rename from ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserGroupsRolesTableModelBuilder.java
rename to ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserGroupsRolesTableModelBuilder.java
index 67ada7462..4b9ff66d5 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserGroupsRolesTableModelBuilder.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserGroupsRolesTableModelBuilder.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.ui.admin.usersgroupsroles;
+package com.arsdigita.ui.admin.usersgroupsroles.users;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.ParameterSingleSelectionModel;
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPrimaryEmailTableModel.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPrimaryEmailTableModel.java
similarity index 97%
rename from ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPrimaryEmailTableModel.java
rename to ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPrimaryEmailTableModel.java
index a97ce2b24..0ab5a6f74 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPrimaryEmailTableModel.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPrimaryEmailTableModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.ui.admin.usersgroupsroles;
+package com.arsdigita.ui.admin.usersgroupsroles.users;
 
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.table.TableModel;
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPrimaryEmailTableModelBuilder.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPrimaryEmailTableModelBuilder.java
similarity index 97%
rename from ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPrimaryEmailTableModelBuilder.java
rename to ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPrimaryEmailTableModelBuilder.java
index 99e37e85f..db96b633d 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPrimaryEmailTableModelBuilder.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPrimaryEmailTableModelBuilder.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.ui.admin.usersgroupsroles;
+package com.arsdigita.ui.admin.usersgroupsroles.users;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.ParameterSingleSelectionModel;
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPropertySheetModel.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPropertySheetModel.java
similarity index 98%
rename from ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPropertySheetModel.java
rename to ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPropertySheetModel.java
index 8da989c14..03244e988 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPropertySheetModel.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPropertySheetModel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.ui.admin.usersgroupsroles;
+package com.arsdigita.ui.admin.usersgroupsroles.users;
 
 import com.arsdigita.bebop.PropertySheetModel;
 import com.arsdigita.globalization.GlobalizedMessage;
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPropertySheetModelBuilder.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPropertySheetModelBuilder.java
similarity index 97%
rename from ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPropertySheetModelBuilder.java
rename to ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPropertySheetModelBuilder.java
index d4b6685cd..aaf1dac82 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UserPropertySheetModelBuilder.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UserPropertySheetModelBuilder.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.ui.admin.usersgroupsroles;
+package com.arsdigita.ui.admin.usersgroupsroles.users;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.ParameterSingleSelectionModel;
diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UsersTable.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UsersTable.java
similarity index 98%
rename from ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UsersTable.java
rename to ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UsersTable.java
index 9a46b7f17..c4ff047d7 100644
--- a/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/UsersTable.java
+++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/usersgroupsroles/users/UsersTable.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package com.arsdigita.ui.admin.usersgroupsroles;
+package com.arsdigita.ui.admin.usersgroupsroles.users;
 
 import com.arsdigita.bebop.Component;
 import com.arsdigita.bebop.ControlLink;
@@ -205,7 +205,7 @@ public class UsersTable extends Table {
                     return user.getName();
                 default:
                     throw new IllegalArgumentException(
-                            "No a valid column index.");
+                            "Not a valid column index.");
             }
         }
 
diff --git a/ccm-core/src/main/java/org/libreccm/security/Group.java b/ccm-core/src/main/java/org/libreccm/security/Group.java
index e307be138..11105b05d 100644
--- a/ccm-core/src/main/java/org/libreccm/security/Group.java
+++ b/ccm-core/src/main/java/org/libreccm/security/Group.java
@@ -54,30 +54,34 @@ import javax.xml.bind.annotation.XmlRootElement;
 @Table(name = "GROUPS", schema = DB_SCHEMA)
 @NamedQueries({
     @NamedQuery(name = "Group.findByName",
-                query = "SELECT g FROM Group g WHERE g.name = :name"),
+                query = "SELECT g FROM Group g WHERE g.name = :name "
+                                + "ORDER BY g.name"),
     @NamedQuery(name = "Group.searchByName",
                 query = "SELECT g FROM Group g "
-                            + "WHERE LOWER(g.name) LIKE '%:name%'")
+                                + "WHERE LOWER(g.name) LIKE '%:name%' "
+                                + "ORDER BY g.name"),
+    @NamedQuery(name = "Group.findAllOrderedByGroupName",
+                query = "SELECT g FROM Group g ORDER BY g.name")
 })
 @NamedEntityGraphs({
     @NamedEntityGraph(
-        name = "Group.withMembersAndRoleMemberships",
-        attributeNodes = {
-            @NamedAttributeNode(value = "memberships"),
-            @NamedAttributeNode(value = "roleMemberships",
-                                subgraph = "role")},
-        subgraphs = {
-            @NamedSubgraph(
-                name = "role",
-                attributeNodes = {
-                    @NamedAttributeNode(value = "role",
-                                        subgraph = "permissions")
-                }),
-            @NamedSubgraph(
-                name = "permissions",
-                attributeNodes = {
-                    @NamedAttributeNode(value = "permissions")})
-        })
+            name = "Group.withMembersAndRoleMemberships",
+            attributeNodes = {
+                @NamedAttributeNode(value = "memberships"),
+                @NamedAttributeNode(value = "roleMemberships",
+                                    subgraph = "role")},
+            subgraphs = {
+                @NamedSubgraph(
+                        name = "role",
+                        attributeNodes = {
+                            @NamedAttributeNode(value = "role",
+                                                subgraph = "permissions")
+                        }),
+                @NamedSubgraph(
+                        name = "permissions",
+                        attributeNodes = {
+                            @NamedAttributeNode(value = "permissions")})
+            })
 })
 @DefaultEntityGraph("Group.withMembersAndRoleMemberships")
 @XmlRootElement(name = "user-group", namespace = CORE_XML_NS)
diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupRepository.java b/ccm-core/src/main/java/org/libreccm/security/GroupRepository.java
index 7e3652c25..d2d687355 100644
--- a/ccm-core/src/main/java/org/libreccm/security/GroupRepository.java
+++ b/ccm-core/src/main/java/org/libreccm/security/GroupRepository.java
@@ -81,4 +81,11 @@ public class GroupRepository extends AbstractEntityRepository<Long, Group> {
         return query.getResultList();
     }
 
+    
+    
+    public List<Group> findAllOrderedByGroupName() {
+        final TypedQuery<Group> query = getEntityManager().createNamedQuery(
+                "Group.findAllOrderedByGroupName", Group.class);
+        return query.getResultList();
+    }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/security/User.java b/ccm-core/src/main/java/org/libreccm/security/User.java
index 587e23058..ad390d882 100644
--- a/ccm-core/src/main/java/org/libreccm/security/User.java
+++ b/ccm-core/src/main/java/org/libreccm/security/User.java
@@ -64,46 +64,54 @@ import javax.xml.bind.annotation.XmlTransient;
 @Table(name = "USERS", schema = DB_SCHEMA)
 @NamedQueries({
     @NamedQuery(name = "User.findByName",
-                query = "SELECT u FROM User u WHERE u.name = :name"),
+                query = "SELECT u FROM User u WHERE u.name = :name "
+                                + "ORDER BY u.name, "
+                                + "         u.familyName, "
+                                + "         u.givenName, "
+                                + "         u.primaryEmailAddress.address"),
     @NamedQuery(name = "User.findByEmailAddress",
                 query = "SELECT u FROM User u WHERE "
-                            + "u.primaryEmailAddress.address = :emailAddress"),
+                                + "u.primaryEmailAddress.address = :emailAddress "
+                        + "ORDER BY u.name, "
+                                + " u.familyName, "
+                                + " u.givenName, "
+                                + " u.primaryEmailAddress.address"),
     @NamedQuery(
-        name = "User.filterByNameAndEmail",
-        query = "SELECT u FROM User u WHERE "
-                    + "LOWER(u.name) LIKE CONCAT(LOWER(:term), '%') "
-                    + "OR LOWER(u.givenName) LIKE CONCAT(LOWER(:term), '%') "
+            name = "User.filterByNameAndEmail",
+            query = "SELECT u FROM User u WHERE "
+                            + "LOWER(u.name) LIKE CONCAT(LOWER(:term), '%') "
+                            + "OR LOWER(u.givenName) LIKE CONCAT(LOWER(:term), '%') "
                     + "OR LOWER(u.familyName) LIKE CONCAT(LOWER(:term), '%') "
-                    + "OR LOWER(u.primaryEmailAddress.address) LIKE CONCAT('%', LOWER(:term), '%')"),
+                            + "OR LOWER(u.primaryEmailAddress.address) LIKE CONCAT('%', LOWER(:term), '%')"),
     @NamedQuery(
-        name = "User.findAllOrderedByUsername",
-        query = "SELECT u FROM User u ORDER BY u.name, "
-                    + "                        u.familyName, "
-                    + "                        u.givenName, "
-                    + "                        u.primaryEmailAddress.address")
+            name = "User.findAllOrderedByUsername",
+            query = "SELECT u FROM User u ORDER BY u.name, "
+                            + "                    u.familyName, "
+                            + "                    u.givenName, "
+                            + "                    u.primaryEmailAddress.address")
 })
 @NamedEntityGraphs({
     @NamedEntityGraph(
-        name = "User.withGroupAndRoleMemberships",
-        attributeNodes = {
-            @NamedAttributeNode(
-                value = "groupMemberships"),
-            @NamedAttributeNode(
-                value = "roleMemberships",
-                subgraph = "role")},
-        subgraphs = {
-            @NamedSubgraph(
-                name = "role",
-                attributeNodes = {
-                    @NamedAttributeNode(value = "role",
-                                        subgraph = "permissions")
-                }),
-            @NamedSubgraph(
-                name = "permissions",
-                attributeNodes = {
-                    @NamedAttributeNode(value = "permissions")}
-            )
-        })
+            name = "User.withGroupAndRoleMemberships",
+            attributeNodes = {
+                @NamedAttributeNode(
+                        value = "groupMemberships"),
+                @NamedAttributeNode(
+                        value = "roleMemberships",
+                        subgraph = "role")},
+            subgraphs = {
+                @NamedSubgraph(
+                        name = "role",
+                        attributeNodes = {
+                            @NamedAttributeNode(value = "role",
+                                                subgraph = "permissions")
+                        }),
+                @NamedSubgraph(
+                        name = "permissions",
+                        attributeNodes = {
+                            @NamedAttributeNode(value = "permissions")}
+                )
+            })
 })
 @DefaultEntityGraph("User.withGroupAndRoleMemberships")
 @XmlRootElement(name = "user", namespace = CORE_XML_NS)
@@ -133,12 +141,12 @@ public class User extends Party implements Serializable {
      */
     @Embedded
     @AssociationOverride(
-        name = "USER_PRIMARY_EMAIL_ADDRESSES",
-        joinTable = @JoinTable(name = "USER_PRIMARY_EMAIL_ADDRESSES",
-                               schema = DB_SCHEMA,
-                               joinColumns = {
-                                   @JoinColumn(name = "USER_ID")
-                               }))
+            name = "USER_PRIMARY_EMAIL_ADDRESSES",
+            joinTable = @JoinTable(name = "USER_PRIMARY_EMAIL_ADDRESSES",
+                                   schema = DB_SCHEMA,
+                                   joinColumns = {
+                                       @JoinColumn(name = "USER_ID")
+                                   }))
     @NotNull
     @XmlElement(name = "primary-email-address", namespace = CORE_XML_NS)
     private EmailAddress primaryEmailAddress;
@@ -267,7 +275,7 @@ public class User extends Party implements Serializable {
     }
 
     protected void setGroupMemberships(
-        final Set<GroupMembership> groupMemberships) {
+            final Set<GroupMembership> groupMemberships) {
         this.groupMemberships = groupMemberships;
     }
 
@@ -276,7 +284,7 @@ public class User extends Party implements Serializable {
     }
 
     protected void removeGroupMembership(
-        final GroupMembership groupMembership) {
+            final GroupMembership groupMembership) {
         groupMemberships.remove(groupMembership);
     }
 
@@ -324,19 +332,19 @@ public class User extends Party implements Serializable {
     @Override
     public String toString(final String data) {
         return super.toString(String.format(
-            ", givenName = \"%s\", "
-                + "familyName = \"%s\", "
-                + "primaryEmailAddress = { %s }, "
-                + "emailAddresses = { %s }, "
-                + "banned = %b, "
-                + "passwordResetRequired = %b%s",
-            givenName,
-            familyName,
-            Objects.toString(primaryEmailAddress),
-            Objects.toString(emailAddresses),
-            banned,
-            passwordResetRequired,
-            data
+                ", givenName = \"%s\", "
+                        + "familyName = \"%s\", "
+                        + "primaryEmailAddress = { %s }, "
+                        + "emailAddresses = { %s }, "
+                        + "banned = %b, "
+                        + "passwordResetRequired = %b%s",
+                givenName,
+                familyName,
+                Objects.toString(primaryEmailAddress),
+                Objects.toString(emailAddresses),
+                banned,
+                passwordResetRequired,
+                data
         ));
     }
 
diff --git a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources.properties b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources.properties
index 5749714c7..1ea8cc59e 100644
--- a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources.properties
+++ b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources.properties
@@ -239,3 +239,9 @@ ui.admin.user.edit_group_memberships=Edit group memberships for user {0}
 ui.admin.user.edit_group_memberships.back_to_user_details=Back to user details
 ui.admin.user_edit_role_memberships=Edit role memberships for user {0}
 ui.admin.user.edit_role_memberships.back_to_user_details=Back to user details
+ui.admin.groups.table.filter.term=Filter groups
+ui.admin.groups.filter.submit=Apply
+ui.admin.groups.table.filter.clear=Clear filter
+ui.admin.groups.table.no_groups=No groups available
+ui.admin.groups.table.name=Name
+ui.admin.groups.table.delete=Delete
diff --git a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_de.properties b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_de.properties
index 497c18a87..b581ae5c3 100644
--- a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_de.properties
+++ b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_de.properties
@@ -239,3 +239,9 @@ ui.admin.user.edit_group_memberships=Gruppen f\u00fcr Benutzer {0} bearbeiten
 ui.admin.user.edit_group_memberships.back_to_user_details=Zur\u00fcck zu den Eigenschaften des Benutzers
 ui.admin.user_edit_role_memberships=Rollen f\u00fcr Benutzer {0} bearbeiten
 ui.admin.user.edit_role_memberships.back_to_user_details=Zur\u00fcck zu den Eigenschaften des Benutzers
+ui.admin.groups.table.filter.term=Gruppen filtern
+ui.admin.groups.filter.submit=Anwenden
+ui.admin.groups.table.filter.clear=Filter zur\u00fccksetzen
+ui.admin.groups.table.no_groups=Keine Gruppen gefunden
+ui.admin.groups.table.name=Name
+ui.admin.groups.table.delete=Delete
diff --git a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_en.properties b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_en.properties
index 220c06b37..0dac6d456 100755
--- a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_en.properties
+++ b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_en.properties
@@ -212,3 +212,9 @@ ui.admin.user.edit_group_memberships=Edit group memberships for user {0}
 ui.admin.user.edit_group_memberships.back_to_user_details=Back to user details
 ui.admin.user_edit_role_memberships=Edit role memberships for user {0}
 ui.admin.user.edit_role_memberships.back_to_user_details=Back to user details
+ui.admin.groups.table.filter.term=Filter groups
+ui.admin.groups.filter.submit=Apply
+ui.admin.groups.table.filter.clear=Clear filter
+ui.admin.groups.table.no_groups=No groups available
+ui.admin.groups.table.name=Name
+ui.admin.groups.table.delete=Delete
diff --git a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_fr.properties b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_fr.properties
index d7c0ede60..fa6d3a339 100755
--- a/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_fr.properties
+++ b/ccm-core/src/main/resources/com/arsdigita/ui/admin/AdminResources_fr.properties
@@ -203,3 +203,9 @@ ui.admin.user.edit_group_memberships=Edit group memberships for user {0}
 ui.admin.user.edit_group_memberships.back_to_user_details=Back to user details
 ui.admin.user_edit_role_memberships=Edit role memberships for user {0}
 ui.admin.user.edit_role_memberships.back_to_user_details=Back to user details
+ui.admin.groups.table.filter.term=Filter groups
+ui.admin.groups.filter.submit=Apply
+ui.admin.groups.table.filter.clear=Clear filter
+ui.admin.groups.table.no_groups=No groups available
+ui.admin.groups.table.name=Name
+ui.admin.groups.table.delete=Delete
diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml
index b230f4734..579b9fcb2 100644
--- a/ccm-docrepo/pom.xml
+++ b/ccm-docrepo/pom.xml
@@ -48,11 +48,13 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <scope>provided</scope>
         </dependency>
         
          <!-- Dependencies for log4j 2 including adapter for the log4j 1.2 API -->
diff --git a/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java b/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java
index 07a1de47b..d28b0c6c7 100644
--- a/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java
+++ b/ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java
@@ -36,21 +36,13 @@ import org.junit.runner.RunWith;
 import org.libreccm.docrepo.File;
 import org.libreccm.docrepo.FileMarshaller;
 import org.libreccm.docrepo.FileRepository;
-import org.libreccm.portation.Format;
 import org.libreccm.portation.Marshals;
 import org.libreccm.tests.categories.IntegrationTest;
 
 import javax.inject.Inject;
 
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -160,6 +152,8 @@ public class FilePortationTest {
                 .getPackage())
             .addAsLibraries(libs)
             .addAsLibraries(coreLibs)
+            .addAsResource("META-INF/jboss-deployment-structure.xml", 
+                           "META-INF/jboss-deployment-structure.xml")
             .addAsResource("test-persistence.xml", "META-INF/persistence.xml")
             .addAsWebInfResource("test-web.xml", "WEB-INF/web.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
diff --git a/ccm-docrepo/src/test/resources/META-INF/jboss-deployment-structure.xml b/ccm-docrepo/src/test/resources/META-INF/jboss-deployment-structure.xml
new file mode 100644
index 000000000..0bf993dff
--- /dev/null
+++ b/ccm-docrepo/src/test/resources/META-INF/jboss-deployment-structure.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-deployment-structure>
+    <deployment>
+        <dependencies>
+            <module name="org.dom4j"/>
+        </dependencies>
+    </deployment>
+</jboss-deployment-structure>
+