diff --git a/.idea/libraries/Mac.xml b/.idea/libraries/Mac.xml
index dae0b732f5d2..256d4c9e54a9 100644
--- a/.idea/libraries/Mac.xml
+++ b/.idea/libraries/Mac.xml
@@ -1,12 +1,12 @@
-<component name="libraryTable">
-  <library name="Mac">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/build/conf/mac/lib/quaqua.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/eawtstub.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/eawtstub_src.zip!/eawtstub_src/src" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="Mac">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/build/conf/mac/lib/quaqua.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/eawtstub.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/eawtstub_src.zip!/src" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Mocks.xml b/.idea/libraries/Mocks.xml
index ab3be1d54be9..7e4ee7018f4e 100644
--- a/.idea/libraries/Mocks.xml
+++ b/.idea/libraries/Mocks.xml
@@ -6,7 +6,7 @@
       <root url="jar://$PROJECT_DIR$/lib/dev/jmock-cglib-1.0.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/easymockclassextension.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/objenesis-1.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dev/mockobjects-core-0.09.jar!/ " />
+      <root url="jar://$PROJECT_DIR$/lib/dev/mockobjects-core-0.09.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-core-1.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-library-1.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/dev/jmock-2.5.1.jar!/" />
diff --git a/.idea/libraries/tcServiceMessages.xml b/.idea/libraries/tcServiceMessages.xml
index 2f8bf99242e5..e7fb38a05d50 100644
--- a/.idea/libraries/tcServiceMessages.xml
+++ b/.idea/libraries/tcServiceMessages.xml
@@ -1,11 +1,11 @@
-<component name="libraryTable">
-  <library name="tcServiceMessages">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/serviceMessages.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/serviceMessages_279xxx_src.zip!/" />
-    </SOURCES>
-  </library>
+<component name="libraryTable">
+  <library name="tcServiceMessages">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/serviceMessages.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/serviceMessages_279xxx_src.jar!/" />
+    </SOURCES>
+  </library>
 </component>
\ No newline at end of file
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
index d18ad53521ba..c92d5b61b675 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
@@ -102,6 +102,10 @@ public abstract class MvcFramework {
     return module.getName().endsWith(getCommonPluginSuffix());
   }
 
+  public List<Module> reorderModulesForMvcView(List<Module> modules) {
+    return modules;
+  }
+  
   public abstract String getApplicationDirectoryName();
 
   public void syncSdkAndLibrariesInPluginsModule(@NotNull Module module) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectNode.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectNode.java
index e43430267187..8159c2993e8a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectNode.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectNode.java
@@ -43,7 +43,10 @@ public class MvcProjectNode extends AbstractProjectNode {
 
   @NotNull
   public Collection<? extends AbstractTreeNode> getChildren() {
-    final List<Module> modules = MvcModuleStructureUtil.getAllModulesWithSupport(myProject, myDescriptor.getFramework());
+    List<Module> modules = MvcModuleStructureUtil.getAllModulesWithSupport(myProject, myDescriptor.getFramework());
+
+    modules = myDescriptor.getFramework().reorderModulesForMvcView(modules);
+    
     final ArrayList<AbstractTreeNode> nodes = new ArrayList<AbstractTreeNode>();
     for (Module module : modules) {
       nodes.add(new MvcModuleNode(module, getSettings(), myDescriptor));
diff --git a/plugins/svn4ideaOld/svn4idea-testsOld.iml b/plugins/svn4ideaOld/svn4idea-testsOld.iml
index 0408c596ec62..1135812c57d2 100644
--- a/plugins/svn4ideaOld/svn4idea-testsOld.iml
+++ b/plugins/svn4ideaOld/svn4idea-testsOld.iml
@@ -34,6 +34,8 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="platform-resources" scope="TEST" />
+    <orderEntry type="module" module-name="dom-impl" scope="TEST" />
   </component>
 </module>
 
diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java
index 30465e7a79ca..669b0d42c469 100644
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java
@@ -136,21 +136,23 @@ public class XmlHighlightVisitor extends XmlElementVisitor implements HighlightV
       }
     } else if (tokenType == XmlTokenType.XML_DATA_CHARACTERS && token.getParent() instanceof XmlText) {
       if (token.textContains(']') && token.textContains('>')) {
+
         String s = token.getText();
         String marker = "]]>";
         int i = s.indexOf(marker);
-        
-        if (i != -1) {                              // TODO: fix
-          TextRange textRange = token.getTextRange();
-          int start = textRange.getStartOffset() + i;
-          HighlightInfoType type = PsiTreeUtil.getParentOfType(token, XmlTag.class) instanceof HtmlTag ?
-                                   HighlightInfoType.WARNING : HighlightInfoType.ERROR;
-          HighlightInfo info = HighlightInfo.createHighlightInfo(
-            type,
-            start, start + marker.length(),
-            XmlErrorMessages.message("cdata.end.should.not.appear.in.content.unless.to.mark.end.of.cdata.section")
-          );
-          addToResults(info);
+
+        if (i != -1 ) {                              // TODO: fix
+          XmlTag tag = PsiTreeUtil.getParentOfType(token, XmlTag.class);
+          if (tag != null && XmlExtension.getExtensionByElement(tag).shouldBeHighlightedAsTag(tag) && !skipValidation(tag)) {
+            TextRange textRange = token.getTextRange();
+            int start = textRange.getStartOffset() + i;
+            HighlightInfo info = HighlightInfo.createHighlightInfo(
+              tag instanceof HtmlTag ? HighlightInfoType.WARNING : HighlightInfoType.ERROR,
+              start, start + marker.length(),
+              XmlErrorMessages.message("cdata.end.should.not.appear.in.content.unless.to.mark.end.of.cdata.section")
+            );
+            addToResults(info);
+          }
         }
       }
     }
diff --git a/xml/impl/src/com/intellij/xml/XmlExtension.java b/xml/impl/src/com/intellij/xml/XmlExtension.java
index 7dcc882d230b..cddc55479e31 100644
--- a/xml/impl/src/com/intellij/xml/XmlExtension.java
+++ b/xml/impl/src/com/intellij/xml/XmlExtension.java
@@ -59,7 +59,7 @@ public abstract class XmlExtension {
     return DEFAULT_EXTENSION;
   }
 
-  @Nullable
+  @SuppressWarnings("ConstantConditions")
   public static XmlExtension getExtensionByElement(PsiElement element) {
     final PsiFile psiFile = element.getContainingFile();
     if (psiFile != null) {