diff --git a/ccm-core/etc/lib/Xerces-J-bin.2.11.0.zip b/ccm-core/etc/lib/Xerces-J-bin.2.11.0.zip
new file mode 100644
index 000000000..88119a294
Binary files /dev/null and b/ccm-core/etc/lib/Xerces-J-bin.2.11.0.zip differ
diff --git a/ccm-core/etc/lib/xalan-j_2_7_2-bin.zip b/ccm-core/etc/lib/xalan-j_2_7_2-bin.zip
new file mode 100644
index 000000000..34ebe781f
Binary files /dev/null and b/ccm-core/etc/lib/xalan-j_2_7_2-bin.zip differ
diff --git a/ccm-core/lib/resolver.jar b/ccm-core/lib/resolver.jar
new file mode 100644
index 000000000..e535bdc07
Binary files /dev/null and b/ccm-core/lib/resolver.jar differ
diff --git a/ccm-core/lib/serializer.jar b/ccm-core/lib/serializer.jar
index 14049a41d..10c881c10 100755
Binary files a/ccm-core/lib/serializer.jar and b/ccm-core/lib/serializer.jar differ
diff --git a/ccm-core/lib/xalan.jar b/ccm-core/lib/xalan.jar
index 4afdd147a..abdabe33e 100755
Binary files a/ccm-core/lib/xalan.jar and b/ccm-core/lib/xalan.jar differ
diff --git a/ccm-core/lib/xercesImpl.jar b/ccm-core/lib/xercesImpl.jar
index d5f3e98c4..0aaa990f3 100755
Binary files a/ccm-core/lib/xercesImpl.jar and b/ccm-core/lib/xercesImpl.jar differ
diff --git a/ccm-core/lib/xml-apis.jar b/ccm-core/lib/xml-apis.jar
index b338fb669..46733464f 100755
Binary files a/ccm-core/lib/xml-apis.jar and b/ccm-core/lib/xml-apis.jar differ
diff --git a/ccm-core/src/com/arsdigita/dispatcher/DispatcherHelper.java b/ccm-core/src/com/arsdigita/dispatcher/DispatcherHelper.java
index e16c921f8..cf3ab51f5 100755
--- a/ccm-core/src/com/arsdigita/dispatcher/DispatcherHelper.java
+++ b/ccm-core/src/com/arsdigita/dispatcher/DispatcherHelper.java
@@ -90,9 +90,7 @@ public final class DispatcherHelper implements DispatcherConstants {
         initialized = true;
     }
 
-    /**
-     * The current HttpServletRequest.
-     */
+    /** The current HttpServletRequest.                                      */
     private static final ThreadLocal s_request = new ThreadLocal();
 
     /** null constructor, private so no one can instantiate! */
@@ -885,6 +883,7 @@ public final class DispatcherHelper implements DispatcherConstants {
     /**
      * If no existing cache policy is set, then call
      * cacheDisable to disable all caching of the response.
+     * @param response
      */
     public static void maybeCacheDisable(HttpServletResponse response) {
         if (!response.containsHeader("Cache-Control")) {
@@ -893,7 +892,9 @@ public final class DispatcherHelper implements DispatcherConstants {
     }
 
     /**
-     * Aggressively disable all caching of the response
+     * Aggressively disable all caching of the response.
+     * 
+     * @param response
      */
     public static void cacheDisable(HttpServletResponse response) {
         init();
@@ -912,6 +913,10 @@ public final class DispatcherHelper implements DispatcherConstants {
         forceCacheDisable(response);
     }
 
+    /**
+     * 
+     * @param response 
+     */
     public static void forceCacheDisable(HttpServletResponse response) {
         init();
         if (!s_cachingActive) {
@@ -927,7 +932,9 @@ public final class DispatcherHelper implements DispatcherConstants {
 
     /**
      * If no existing cache policy is set, then
-     * call cacheForUser to enable caching for a user
+     * call cacheForUser to enable caching for a user.
+     * 
+     * @param response
      */
     public static void maybeCacheForUser(HttpServletResponse response) {
         if (!response.containsHeader("Cache-Control")) {
@@ -936,9 +943,11 @@ public final class DispatcherHelper implements DispatcherConstants {
     }
 
     /**
-     * Allow caching of the response for this user only,
-     * as identified by the Cookie header. The response
-     * will expire according to the default age setting
+     * Allow caching of the response for this user only, as identified
+     * by the Cookie header. The response will expire according
+     * to the default age setting.
+     * 
+     * @param response
      */
     public static void cacheForUser(HttpServletResponse response) {
         cacheForUser(response, s_defaultExpiry);
@@ -948,6 +957,7 @@ public final class DispatcherHelper implements DispatcherConstants {
      * If no existing cache policy is set, then
      * call cacheForUser to enable caching for a user
      *
+     * @param response
      * @param maxage the max time in second until this expires
      */
     public static void maybeCacheForUser(HttpServletResponse response,
@@ -961,6 +971,7 @@ public final class DispatcherHelper implements DispatcherConstants {
      * If no existing cache policy is set, then
      * call cacheForUser to enable caching for a user
      *
+     * @param response
      * @param expiry the time at which to expire
      */
     public static void maybeCacheForUser(HttpServletResponse response,
@@ -974,6 +985,7 @@ public final class DispatcherHelper implements DispatcherConstants {
      * Allow caching of the response for this user only,
      * as identified by the Cookie header. The response
      * will expire in 'age' seconds time.
+     * @param response
      * @param maxage the max life of the response in seconds
      */
     public static void cacheForUser(HttpServletResponse response,
@@ -1004,6 +1016,7 @@ public final class DispatcherHelper implements DispatcherConstants {
     /**
      * Allowing caching of the response for this user only.
      * The response will expire at time given in the expiry parameter
+     * @param response
      * @param expiry time at which to expire
      */
     public static void cacheForUser(HttpServletResponse response,
@@ -1012,10 +1025,11 @@ public final class DispatcherHelper implements DispatcherConstants {
     }
 
     /**
-     * If no existing cache policy is set, then
-     * call cacheForUser to enable caching for
-     * the world. The response expiry will take
-     * the default age setting
+     * If no existing cache policy is set, then call cacheForUser to enable
+     * caching for the world. The response expiry will take the default
+     * age setting.
+     * 
+     * @param response
      */
     public static void maybeCacheForWorld(HttpServletResponse response) {
         if (!response.containsHeader("Cache-Control")) {
@@ -1024,18 +1038,20 @@ public final class DispatcherHelper implements DispatcherConstants {
     }
 
     /**
-     * Allow caching of this response for anyone in the
-     * world. The response take the default expiry
-     * time
+     * Allow caching of this response for anyone in the world.
+     * The response take the default expiry time.
+     * 
+     * @param response
      */
     public static void cacheForWorld(HttpServletResponse response) {
         cacheForWorld(response, s_defaultExpiry);
     }
 
     /**
-     * If no existing cache policy is set, then
-     * call cacheForUser to enable caching for
-     * the world
+     * If no existing cache policy is set, then call cacheForUser to enable
+     * caching for the world.
+     * 
+     * @param response
      * @param maxage the time in seconds until expiry
      */
     public static void maybeCacheForWorld(HttpServletResponse response,
@@ -1046,9 +1062,10 @@ public final class DispatcherHelper implements DispatcherConstants {
     }
 
     /**
-     * If no existing cache policy is set, then
-     * call cacheForUser to enable caching for
-     * the world
+     * If no existing cache policy is set, then call cacheForUser to
+     * enable caching for the world.
+     * 
+     * @param response
      * @param expiry the time at which it will expire
      */
     public static void maybeCacheForWorld(HttpServletResponse response,
@@ -1062,6 +1079,7 @@ public final class DispatcherHelper implements DispatcherConstants {
      * Allow caching of this response for anyone in the
      * world. The response will expire at the current time
      * plus maxage seconds.
+     * @param response
      * @param maxage time in seconds until this expires
      */
     public static void cacheForWorld(HttpServletResponse response,
@@ -1088,6 +1106,9 @@ public final class DispatcherHelper implements DispatcherConstants {
     /**
      * Allow caching of this response for anyone in the world.
      * THe response will  expire at the time given.
+     * 
+     * @param response
+     * @param expiry
      */
     public static void cacheForWorld(HttpServletResponse response,
                                      Date expiry) {