Merge from celltable branch

diff --cc ear/META-INF/application.xml
index d80a0d0,9773b0b..dd3617e
--- 1/ear/META-INF/application.xml
--- 2/ear/META-INF/application.xml
+++ b/ear/META-INF/application.xml
@@@ -10,9 -11,10 +11,10 @@@
        <module>
                <web>
                        <web-uri>gss-admin.war</web-uri>
 -                      <context-root>/admin</context-root>
 +                      <context-root>/gss-admin</context-root>
                </web>
        </module>
+       
        <module>
                <web>
                        <web-uri>webdav.war</web-uri>

diff --cc src/gr/ebs/gss/client/GSS.java
Simple merge

diff --cc src/gr/ebs/gss/client/Groups.java
index cab515d,b5cf629..6736ace
--- 1/src/gr/ebs/gss/client/Groups.java
--- 2/src/gr/ebs/gss/client/Groups.java
+++ b/src/gr/ebs/gss/client/Groups.java
@@@ -184,7 -188,7 +187,6 @@@ public class Groups extends Composite i
  \r
        /**\r
         * A helper method to simplify adding tree items that have attached images.\r
--       * {@link #addImageItem(TreeItem, String) code}\r
         *\r
         * @param parent the tree item to which the new item will be added.\r
         * @param title the text associated with this item.\r
@@@ -242,7 -249,7 +247,6 @@@
         * Generate an RPC request to retrieve the users of the specified group for\r
         * display.\r
         *\r
--       * @param userId the ID of the current user\r
         * @param groupItem the TreeItem widget that corresponds to the requested\r
         *            group\r
         */\r

diff --cc src/gr/ebs/gss/client/TopPanel.java
Simple merge

diff --cc src/gr/ebs/gss/server/ejb/ExternalAPI.java
Simple merge

diff --cc src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
Simple merge