diff --git a/.idea/libraries/winp.xml b/.idea/libraries/winp.xml
index ca5008ccc110..6e23b6ef4581 100644
--- a/.idea/libraries/winp.xml
+++ b/.idea/libraries/winp.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="winp">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/winp-1.16-patched.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/winp-1.17-patched.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/winp-1.16-patched-src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/winp-1.17-patched-src.zip!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index e998a02881f5..853e8e76af1a 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -235,7 +235,7 @@ libraryLicense(name: "TestNG", version: "5.7 snapshot", license: "Apache 2.0", u
 libraryLicense(name: "Trilead SSH", libraryName: "trilead-ssh2", version: "build 213", license: "BSD style (see LICENSE.txt in trilead.jar)", url: "http://www.trilead.com/SSH_Library/")
 libraryLicense(name: "Trove4j", version: "1.1 (with patches by JetBrains)", license: "LGPL", url: "http://trove4j.sourceforge.net/", licenseUrl: "http://trove4j.sourceforge.net/html/license.html")
 libraryLicense(name: "Velocity", version: "1.7", license: "Apache 2.0", url: "http://velocity.apache.org/", licenseUrl: "http://velocity.apache.org/index.html")
-libraryLicense(name: "winp", version: "1.16 (patched)", license: "MIT", url: "http://java.net/projects/winp", licenseUrl: "http://opensource.org/licenses/mit-license.php")
+libraryLicense(name: "winp", version: "1.17 (patched)", license: "MIT", url: "http://java.net/projects/winp", licenseUrl: "http://opensource.org/licenses/mit-license.php")
 libraryLicense(name: "Xalan", libraryName:"Xalan-2.7.1", version: "2.7.1", license: "Apache 2.0", url: "http://xml.apache.org/xalan-j/", licenseUrl: "http://xml.apache.org/xalan-j/")
 libraryLicense(name: "Xerces", version: "2.9.1", license: "Apache 2.0", url: "http://xerces.apache.org/xerces2-j/", licenseUrl: "http://xerces.apache.org/xerces2-j/")
 libraryLicense(name: "XML Commons (xml-apis.jar, resolver.jar)", version: "", license: "Apache 2.0, W3C Software License , public domain", url: "http://xml.apache.org/commons/", licenseUrl: "http://xml.apache.org/commons/licenses.html")
diff --git a/colorSchemes/src/colorSchemes/Darcula.xml b/colorSchemes/src/colorSchemes/Darcula.xml
index 9d5d944c35ca..5debddc000c6 100644
--- a/colorSchemes/src/colorSchemes/Darcula.xml
+++ b/colorSchemes/src/colorSchemes/Darcula.xml
@@ -26,7 +26,7 @@
     <option name="FILESTATUS_changelistConflict" value="d5756c" />
     <option name="FILESTATUS_modifiedOutside" value="6897bb" />
     <option name="GUTTER_BACKGROUND" value="313335" />
-    <option name="INDENT_GUIDE" value="4d4d4d" />
+    <option name="INDENT_GUIDE" value="373737" />
     <option name="LINE_NUMBERS_COLOR" value="888888" />
     <option name="METHOD_SEPARATORS_COLOR" value="4d4d4d" />
     <option name="MODIFIED_LINES_COLOR" value="7180" />
@@ -35,10 +35,11 @@
     <option name="RECURSIVE_CALL_ATTRIBUTES" value="574300" />
     <option name="REMOTE_HOST_MAPPED_BACKGROUND_KEY" value="164716" />
     <option name="RIGHT_MARGIN_COLOR" value="4d4d4d" />
-    <option name="SELECTED_TEARLINE_COLOR" value="ffffff" />
+    <option name="SELECTED_INDENT_GUIDE" value="505050" />
+    <option name="SELECTED_TEARLINE_COLOR" value="787878" />
     <option name="SELECTION_BACKGROUND" value="214283" />
     <option name="SELECTION_FOREGROUND" value="" />
-    <option name="TEARLINE_COLOR" value="909090" />
+    <option name="TEARLINE_COLOR" value="555555" />
     <option name="WHITESPACES" value="404040" />
   </colors>
   <attributes>
@@ -1615,7 +1616,7 @@
     </option>
     <option name="XML_ATTRIBUTE_NAME">
       <value>
-        <option name="FOREGROUND" value="d0d0ff" />
+        <option name="FOREGROUND" value="bababa" />
       </value>
     </option>
     <option name="XML_ATTRIBUTE_VALUE">
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form
index 729a320ebec4..976e2ed482a3 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.compiler.options.CompilerUIConfigurable">
-  <grid id="1663f" binding="myPanel" layout-manager="GridLayoutManager" row-count="10" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="1663f" binding="myPanel" layout-manager="GridLayoutManager" row-count="11" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="28" y="24" width="883" height="379"/>
@@ -10,7 +10,7 @@
     <children>
       <vspacer id="67edf">
         <constraints>
-          <grid row="9" column="0" row-span="1" col-span="3" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="10" column="0" row-span="1" col-span="3" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <grid id="b341d" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="1">
@@ -95,7 +95,7 @@
       </component>
       <component id="17126" class="javax.swing.JLabel" binding="myHeapSizeLabel">
         <constraints>
-          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Compiler process heap size (Mbytes):"/>
@@ -103,7 +103,7 @@
       </component>
       <component id="a28b8" class="javax.swing.JTextField" binding="myHeapSizeField">
         <constraints>
-          <grid row="7" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false">
+          <grid row="8" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false">
             <preferred-size width="50" height="-1"/>
           </grid>
         </constraints>
@@ -111,7 +111,7 @@
       </component>
       <component id="5b86a" class="javax.swing.JLabel" binding="myVMOptionsLabel">
         <constraints>
-          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Additional compiler process VM options:"/>
@@ -119,7 +119,7 @@
       </component>
       <component id="b5547" class="javax.swing.JTextField" binding="myVMOptionsField">
         <constraints>
-          <grid row="8" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="9" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
@@ -149,6 +149,14 @@
           <text value="(only works while not running / debugging)"/>
         </properties>
       </component>
+      <component id="4b44" class="javax.swing.JCheckBox" binding="myCbRebuildOnDependencyChange" default-binding="true">
+        <constraints>
+          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Rebuild module on dependency change"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
index 57e1ad71c8f7..1119311d695e 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
@@ -55,6 +55,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
   private JTextField myVMOptionsField;
   private JLabel myHeapSizeLabel;
   private JLabel myVMOptionsLabel;
+  private JCheckBox myCbRebuildOnDependencyChange;
 
   public CompilerUIConfigurable(final Project project) {
     myProject = project;
@@ -84,6 +85,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
     myCbUseExternalBuild.setSelected(workspaceConfiguration.USE_COMPILE_SERVER);
     myCbEnableAutomake.setSelected(workspaceConfiguration.MAKE_PROJECT_ON_SAVE);
     myCbParallelCompilation.setSelected(workspaceConfiguration.PARALLEL_COMPILATION);
+    myCbRebuildOnDependencyChange.setSelected(workspaceConfiguration.REBUILD_ON_DEPENDENCY_CHANGE);
     myHeapSizeField.setText(String.valueOf(workspaceConfiguration.COMPILER_PROCESS_HEAP_SIZE));
     final String options = workspaceConfiguration.COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS;
     myVMOptionsField.setText(options == null? "" : options.trim());
@@ -115,6 +117,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
     workspaceConfiguration.USE_COMPILE_SERVER = myCbUseExternalBuild.isSelected();
     workspaceConfiguration.MAKE_PROJECT_ON_SAVE = myCbEnableAutomake.isSelected();
     workspaceConfiguration.PARALLEL_COMPILATION = myCbParallelCompilation.isSelected();
+    workspaceConfiguration.REBUILD_ON_DEPENDENCY_CHANGE = myCbRebuildOnDependencyChange.isSelected();
     try {
       workspaceConfiguration.COMPILER_PROCESS_HEAP_SIZE = Integer.parseInt(myHeapSizeField.getText().trim());
     }
@@ -173,6 +176,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
     isModified |= ComparingUtils.isModified(myCbUseExternalBuild, workspaceConfiguration.USE_COMPILE_SERVER);
     isModified |= ComparingUtils.isModified(myCbEnableAutomake, workspaceConfiguration.MAKE_PROJECT_ON_SAVE);
     isModified |= ComparingUtils.isModified(myCbParallelCompilation, workspaceConfiguration.PARALLEL_COMPILATION);
+    isModified |= ComparingUtils.isModified(myCbRebuildOnDependencyChange, workspaceConfiguration.REBUILD_ON_DEPENDENCY_CHANGE);
     isModified |= ComparingUtils.isModified(myHeapSizeField, workspaceConfiguration.COMPILER_PROCESS_HEAP_SIZE);
     isModified |= ComparingUtils.isModified(myVMOptionsField, workspaceConfiguration.COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS);
 
@@ -211,6 +215,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
   private void updateExternalMakeOptionControls(boolean enabled) {
     myCbEnableAutomake.setEnabled(enabled);
     myCbParallelCompilation.setEnabled(enabled);
+    myCbRebuildOnDependencyChange.setEnabled(enabled);
     myHeapSizeField.setEnabled(enabled);
     myVMOptionsField.setEnabled(enabled);
     myHeapSizeLabel.setEnabled(enabled);
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index c37fd886da48..e16b3d91c4c1 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -827,6 +827,7 @@ public class BuildManager implements ApplicationComponent{
       cmdLine.addParameter("-D"+ GlobalOptions.GENERATE_CLASSPATH_INDEX_OPTION +"=" + shouldGenerateIndex);
     }
     cmdLine.addParameter("-D"+ GlobalOptions.COMPILE_PARALLEL_OPTION +"=" + Boolean.toString(config.PARALLEL_COMPILATION));
+    cmdLine.addParameter("-D"+ GlobalOptions.REBUILD_ON_DEPENDENCY_CHANGE_OPTION + "=" + Boolean.toString(config.REBUILD_ON_DEPENDENCY_CHANGE));
 
     if (Boolean.TRUE.equals(Boolean.valueOf(System.getProperty("java.net.preferIPv4Stack", "false")))) {
       cmdLine.addParameter("-Djava.net.preferIPv4Stack=true");
diff --git a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java
index 89fdd636d344..0445ab0cd742 100644
--- a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java
+++ b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java
@@ -42,6 +42,7 @@ public class CompilerWorkspaceConfiguration implements PersistentStateComponent<
   public boolean PARALLEL_COMPILATION = false;
   public int COMPILER_PROCESS_HEAP_SIZE = DEFAULT_COMPILE_PROCESS_HEAP_SIZE;
   public String COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS = DEFAULT_COMPILE_PROCESS_VM_OPTIONS;
+  public boolean REBUILD_ON_DEPENDENCY_CHANGE = true;
 
   public static CompilerWorkspaceConfiguration getInstance(Project project) {
     return ServiceManager.getService(project, CompilerWorkspaceConfiguration.class);
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
index a285463aeea4..0cf455de5068 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -616,6 +616,11 @@ public abstract class BreakpointWithHighlighter extends Breakpoint {
       return myDescription;
     }
 
+    @Override
+    public Alignment getAlignment() {
+      return Alignment.RIGHT;
+    }
+
     @Override
     public AnAction getClickAction() {
       return new AnAction() {
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
index 4a1ac632a868..1a21b65af873 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
@@ -24,7 +24,6 @@ import com.intellij.patterns.ElementPattern;
 import com.intellij.patterns.PsiJavaPatterns;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.psi.codeStyle.SuggestedNameInfo;
 import com.intellij.psi.codeStyle.VariableKind;
@@ -366,46 +365,36 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
                                                     final boolean staticContext,
                                                     final PsiType varType,
                                                     final PsiElement element) {
-    class Change implements Runnable {
-      private String[] result;
+    final List<String> propertyHandlers = new ArrayList<String>();
 
-      @Override
-      public void run() {
-        final List<String> propertyHandlers = new ArrayList<String>();
-        final PsiField[] fields = psiClass.getFields();
+    for (final PsiField field : psiClass.getFields()) {
+      if (field == element) continue;
 
-        for (final PsiField field : fields) {
-          if (field == element) continue;
+      assert field.isValid() : "invalid field: " + field;
+      PsiType fieldType = field.getType();
+      assert fieldType.isValid() : "invalid field type: " + field + "; " + fieldType + " of " + fieldType.getClass();
 
-          assert field.isValid() : "invalid field: " + field;
-          PsiType fieldType = field.getType();
-          assert fieldType.isValid() : "invalid field type: " + field + "; " + fieldType + " of " + fieldType.getClass();
+      final PsiModifierList modifierList = field.getModifierList();
+      if (staticContext && (modifierList != null && !modifierList.hasModifierProperty(PsiModifier.STATIC))) continue;
 
-          final PsiModifierList modifierList = field.getModifierList();
-          if (staticContext && (modifierList != null && !modifierList.hasModifierProperty(PsiModifier.STATIC))) continue;
+      if (fieldType.equals(varType)) {
+        final String getterName = PropertyUtil.suggestGetterName(field.getProject(), field);
+        if ((psiClass.findMethodsByName(getterName, true).length == 0 ||
+             psiClass.findMethodBySignature(PropertyUtil.generateGetterPrototype(field), true) == null)) {
+          propertyHandlers.add(getterName);
+        }
+      }
 
-          if (fieldType.equals(varType)) {
-            final String getterName = PropertyUtil.suggestGetterName(field.getProject(), field);
-            if ((psiClass.findMethodsByName(getterName, true).length == 0 ||
-                 psiClass.findMethodBySignature(PropertyUtil.generateGetterPrototype(field), true) == null)) {
-              propertyHandlers.add(getterName);
-            }
-          }
-
-          if (PsiType.VOID.equals(varType)) {
-            final String setterName = PropertyUtil.suggestSetterName(field.getProject(), field);
-            if ((psiClass.findMethodsByName(setterName, true).length == 0 ||
-                 psiClass.findMethodBySignature(PropertyUtil.generateSetterPrototype(field), true) == null)) {
-              propertyHandlers.add(setterName);
-            }
-          }
+      if (PsiType.VOID.equals(varType)) {
+        final String setterName = PropertyUtil.suggestSetterName(field.getProject(), field);
+        if ((psiClass.findMethodsByName(setterName, true).length == 0 ||
+             psiClass.findMethodBySignature(PropertyUtil.generateSetterPrototype(field), true) == null)) {
+          propertyHandlers.add(setterName);
         }
-        result = ArrayUtil.toStringArray(propertyHandlers);
       }
     }
-    final Change result = new Change();
-    CodeStyleManager.getInstance(element.getProject()).performActionWithFormatterDisabled(result);
-    return result.result;
+
+    return ArrayUtil.toStringArray(propertyHandlers);
   }
 
   private static void addLookupItems(Set<LookupElement> lookupElements, @Nullable final SuggestedNameInfo callback, PrefixMatcher matcher, Project project, String... strings) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
index 8008c75ab5b6..73ac96b7a5d3 100644
--- a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
@@ -431,7 +431,13 @@ public class MethodParameterInfoHandler implements ParameterInfoHandlerWithTabAc
   public void updateUI(final Object p, final ParameterInfoUIContext context) {
     if (p instanceof CandidateInfo) {
       CandidateInfo info = (CandidateInfo)p;
-      updateMethodPresentation((PsiMethod)info.getElement(), getCandidateInfoSubstitutor(info), context);
+      PsiMethod method = (PsiMethod)info.getElement();
+      if (!method.isValid()) {
+        context.setUIComponentEnabled(false);
+        return;
+      }
+
+      updateMethodPresentation(method, getCandidateInfoSubstitutor(info), context);
     }
     else {
       updateMethodPresentation((PsiMethod)p, null, context);
diff --git a/java/java-impl/src/com/intellij/codeInspection/AnnotateMethodFix.java b/java/java-impl/src/com/intellij/codeInspection/AnnotateMethodFix.java
index 88cc269db319..6861ff990ac7 100644
--- a/java/java-impl/src/com/intellij/codeInspection/AnnotateMethodFix.java
+++ b/java/java-impl/src/com/intellij/codeInspection/AnnotateMethodFix.java
@@ -76,7 +76,7 @@ public class AnnotateMethodFix implements LocalQuickFix {
     if (annotateOverriddenMethods()) {
       PsiMethod[] methods = OverridingMethodsSearch.search(method, GlobalSearchScope.allScope(project), true).toArray(PsiMethod.EMPTY_ARRAY);
       for (PsiMethod psiMethod : methods) {
-        if (!AnnotationUtil.isAnnotated(psiMethod, myAnnotation, false, false) && psiMethod.getManager().isInProject(psiMethod)) {
+        if (AnnotationUtil.isAnnotatingApplicable(psiMethod, myAnnotation) && !AnnotationUtil.isAnnotated(psiMethod, myAnnotation, false, false) && psiMethod.getManager().isInProject(psiMethod)) {
           toAnnotate.add(psiMethod);
         }
       }
diff --git a/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
index e3170217680f..4b99a0540ebb 100644
--- a/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+++ b/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
@@ -1218,7 +1218,7 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
         ConditionalGotoInstruction cond = new ConditionalGotoInstruction(NOT_FOUND, false, null);
         addInstruction(cond);
         addInstruction(new EmptyStackInstruction());
-        addInstruction(new PushInstruction(myFactory.getTypeFactory().create(ref), null));
+        addInstruction(new PushInstruction(myFactory.getNotNullFactory().create(ref), null));
         addThrowCode(ref);
         cond.setOffset(myCurrentFlow.getInstructionCount());
       }
@@ -1305,7 +1305,8 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
             return true;
           }
         }
-        else if ("junit.framework.Assert".equals(className) || "org.junit.Assert".equals(className) || "org.testng.Assert".equals(className)) {
+        else if ("junit.framework.Assert".equals(className) || "org.junit.Assert".equals(className) ||
+                 "junit.framework.TestCase".equals(className) || "org.testng.Assert".equals(className)) {
           boolean testng = "org.testng.Assert".equals(className);
           if ("fail".equals(methodName)) {
             pushParameters(params, false, !testng);
diff --git a/java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
index dd5183d451d8..6a1ce9b2e82d 100644
--- a/java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
+++ b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
@@ -46,7 +46,7 @@ import java.util.*;
 
 public class DataFlowRunner {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.dataFlow.DataFlowRunner");
-  private static final Key<Integer> TOO_EXPENSIVE_SIZE = Key.create("TOO_EXPENSIVE_SIZE");
+  private static final Key<Integer> TOO_EXPENSIVE_HASH = Key.create("TOO_EXPENSIVE_HASH");
   public static final long ourTimeLimit = 1000 * 1000 * 1000; //1 sec in nanoseconds
 
   private Instruction[] myInstructions;
@@ -103,14 +103,16 @@ public class DataFlowRunner {
       myFields = flow.getFields();
 
       if (LOG.isDebugEnabled()) {
+        LOG.debug("Analyzing code block: " + psiBlock.getText());
         for (int i = 0; i < myInstructions.length; i++) {
           Instruction instruction = myInstructions[i];
           LOG.debug(i + ": " + instruction.toString());
         }
       }
 
-      Integer tooExpensiveSize = psiBlock.getUserData(TOO_EXPENSIVE_SIZE);
-      if (tooExpensiveSize != null && tooExpensiveSize == psiBlock.getText().hashCode()) {
+      Integer tooExpensiveHash = psiBlock.getUserData(TOO_EXPENSIVE_HASH);
+      if (tooExpensiveHash != null && tooExpensiveHash == psiBlock.getText().hashCode()) {
+        LOG.debug("Too complex because hasn't changed since being too complex already");
         return RunnerResult.TOO_COMPLEX;
       }
 
@@ -125,7 +127,8 @@ public class DataFlowRunner {
       int count = 0;
       while (!queue.isEmpty()) {
         if (count % 50 == 0 && !unitTestMode && measurer.isTimeOver()) {
-          psiBlock.putUserData(TOO_EXPENSIVE_SIZE, psiBlock.getText().hashCode());
+          LOG.debug("Too complex because the analysis took too long");
+          psiBlock.putUserData(TOO_EXPENSIVE_HASH, psiBlock.getText().hashCode());
           return RunnerResult.TOO_COMPLEX;
         }
         ProgressManager.checkCanceled();
@@ -140,11 +143,14 @@ public class DataFlowRunner {
 
         if (instruction instanceof BranchingInstruction) {
           if (!instruction.setMemoryStateProcessed(instructionState.getMemoryState().createCopy())) {
+            LOG.debug("Too complex because too many different possible states");
             return RunnerResult.TOO_COMPLEX; // Too complex :(
           }
         }
 
-        //System.out.println(instructionState);
+        if (LOG.isDebugEnabled()) {
+          LOG.debug(instructionState.toString());
+        }
 
         DfaInstructionState[] after = instruction.accept(this, instructionState.getMemoryState(), visitor);
         if (after != null) {
@@ -160,15 +166,18 @@ public class DataFlowRunner {
         count++;
       }
 
-      psiBlock.putUserData(TOO_EXPENSIVE_SIZE, null);
+      psiBlock.putUserData(TOO_EXPENSIVE_HASH, null);
+      LOG.debug("Analysis ok");
       return RunnerResult.OK;
     }
     catch (ArrayIndexOutOfBoundsException e) {
-      LOG.error(psiBlock.getText(), e); /* TODO[max] !!! hack (of 18186). Please fix in better times. */
+      LOG.error(psiBlock.getText(), e); // TODO fix in better times
       return RunnerResult.ABORTED;
     }
     catch (EmptyStackException e) {
-      //LOG.error(psiBlock.getText(), e); /* TODO[max] !!! hack (of 18186). Please fix in better times. */
+      if (LOG.isDebugEnabled()) {
+        LOG.error(e); // TODO fix in better times
+      }
       return RunnerResult.ABORTED;
     }
   }
diff --git a/java/java-impl/src/com/intellij/codeInspection/nullable/AnnotateOverriddenMethodParameterFix.java b/java/java-impl/src/com/intellij/codeInspection/nullable/AnnotateOverriddenMethodParameterFix.java
index a8edce01d507..03a202db332e 100644
--- a/java/java-impl/src/com/intellij/codeInspection/nullable/AnnotateOverriddenMethodParameterFix.java
+++ b/java/java-impl/src/com/intellij/codeInspection/nullable/AnnotateOverriddenMethodParameterFix.java
@@ -81,7 +81,9 @@ public class AnnotateOverriddenMethodParameterFix implements LocalQuickFix {
     for (PsiParameter psiParam : toAnnotate) {
       try {
         assert psiParam != null : toAnnotate;
-        new AddAnnotationFix(myAnnotation, psiParam, myAnnosToRemove).invoke(project, null, psiParam.getContainingFile());
+        if (AnnotationUtil.isAnnotatingApplicable(psiParam, myAnnotation)) {
+          new AddAnnotationFix(myAnnotation, psiParam, myAnnosToRemove).invoke(project, null, psiParam.getContainingFile());
+        }
       }
       catch (IncorrectOperationException e) {
         LOG.error(e);
diff --git a/java/java-impl/src/com/intellij/codeInspection/nullable/ChangeNullableDefaultsFix.java b/java/java-impl/src/com/intellij/codeInspection/nullable/ChangeNullableDefaultsFix.java
new file mode 100644
index 000000000000..53b439f0d2d5
--- /dev/null
+++ b/java/java-impl/src/com/intellij/codeInspection/nullable/ChangeNullableDefaultsFix.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInspection.nullable;
+
+import com.intellij.codeInsight.NullableNotNullManager;
+import com.intellij.codeInspection.LocalQuickFix;
+import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiAnnotation;
+import org.jetbrains.annotations.NotNull;
+
+/**
+* User: anna
+* Date: 2/22/13
+*/
+class ChangeNullableDefaultsFix implements LocalQuickFix {
+  private final NullableNotNullManager myManager;
+  private final String myNotNullName;
+  private final String myNullableName;
+
+  public ChangeNullableDefaultsFix(PsiAnnotation notNull, PsiAnnotation nullable, NullableNotNullManager manager) {
+    myNotNullName = notNull != null ? notNull.getQualifiedName() : null;
+    myNullableName = nullable != null ? nullable.getQualifiedName() : null;
+    myManager = manager;
+  }
+
+  ChangeNullableDefaultsFix(String notNull, String nullable, NullableNotNullManager manager) {
+    myManager = manager;
+    myNotNullName = notNull;
+    myNullableName = nullable;
+  }
+
+  @NotNull
+  @Override
+  public String getName() {
+    return "Make \"" + (myNotNullName != null ? myNotNullName : myNullableName) + "\" default annotation";
+  }
+
+  @NotNull
+  @Override
+  public String getFamilyName() {
+    return getName();
+  }
+
+  @Override
+  public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
+    if (myNotNullName != null) {
+      myManager.setDefaultNotNull(myNotNullName);
+    } else {
+      myManager.setDefaultNullable(myNullableName);
+    }
+  }
+}
diff --git a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
index c2eb806257b7..b59d821bbecf 100644
--- a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
@@ -85,6 +85,14 @@ public class NullableStuffInspection extends BaseLocalInspectionTool {
           final String anno = annotated.isDeclaredNotNull ? manager.getDefaultNotNull() : manager.getDefaultNullable();
           final List<String> annoToRemove = annotated.isDeclaredNotNull ? manager.getNullables() : manager.getNotNulls();
 
+          if (!AnnotationUtil.isAnnotatingApplicable(field, anno)) {
+            final PsiAnnotation notNull = AnnotationUtil.findAnnotation(field, manager.getNotNulls());
+            final PsiAnnotation nullable = AnnotationUtil.findAnnotation(field, manager.getNullables());
+            holder.registerProblem(field.getNameIdentifier(), "Nullable/NotNull defaults are not accessible in current context",
+                                   new ChangeNullableDefaultsFix(notNull, nullable, manager));
+            return;
+          }
+
           String propName = JavaCodeStyleManager.getInstance(project).variableNameToPropertyName(field.getName(), VariableKind.FIELD);
           final boolean isStatic = field.hasModifierProperty(PsiModifier.STATIC);
           final PsiMethod getter = PropertyUtil.findPropertyGetter(field.getContainingClass(), propName, isStatic, false);
@@ -289,9 +297,13 @@ public class NullableStuffInspection extends BaseLocalInspectionTool {
         reported_not_annotated_method_overrides_notnull = true;
         final String defaultNotNull = nullableManager.getDefaultNotNull();
         final String[] annotationsToRemove = ArrayUtil.toStringArray(nullableManager.getNullables());
+        final LocalQuickFix fix = AnnotationUtil.isAnnotatingApplicable(method, defaultNotNull)
+                                  ? createAnnotateMethodFix(defaultNotNull, annotationsToRemove)
+                                  : createChangeDefaultNotNullFix(nullableManager, superMethod);
         holder.registerProblem(method.getNameIdentifier(),
                                InspectionsBundle.message("inspection.nullable.problems.method.overrides.NotNull"),
-                               ProblemHighlightType.GENERIC_ERROR_OR_WARNING, createAnnotateMethodFix(defaultNotNull, annotationsToRemove));
+                               ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
+                               wrapFix(fix));
       }
       if (REPORT_NOTNULL_PARAMETER_OVERRIDES_NULLABLE || REPORT_NOT_ANNOTATED_METHOD_OVERRIDES_NOTNULL) {
         PsiParameter[] superParameters = superMethod.getParameterList().getParameters();
@@ -313,10 +325,13 @@ public class NullableStuffInspection extends BaseLocalInspectionTool {
             if (!AnnotationUtil.isAnnotated(parameter, nullableManager.getAllAnnotations(), false, false) &&
                 nullableManager.isNotNull(superParameter, false)) {
               reported_not_annotated_parameter_overrides_notnull[i] = true;
+              final LocalQuickFix fix = AnnotationUtil.isAnnotatingApplicable(parameter, nullableManager.getDefaultNotNull()) 
+                                        ? new AddNotNullAnnotationFix(parameter) 
+                                        : createChangeDefaultNotNullFix(nullableManager, superParameter);
               holder.registerProblem(parameter.getNameIdentifier(),
                                      InspectionsBundle.message("inspection.nullable.problems.parameter.overrides.NotNull"),
                                      ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-                                     new AddNotNullAnnotationFix(parameter));
+                                     wrapFix(fix));
             }
           }
         }
@@ -334,22 +349,34 @@ public class NullableStuffInspection extends BaseLocalInspectionTool {
       }
       if (hasAnnotatedParameter || annotated.isDeclaredNotNull) {
         PsiManager manager = method.getManager();
+        final String defaultNotNull = nullableManager.getDefaultNotNull();
+        final boolean superMethodApplicable = AnnotationUtil.isAnnotatingApplicable(method, defaultNotNull);
         PsiMethod[] overridings =
           OverridingMethodsSearch.search(method, GlobalSearchScope.allScope(manager.getProject()), true).toArray(PsiMethod.EMPTY_ARRAY);
         boolean methodQuickFixSuggested = false;
         for (PsiMethod overriding : overridings) {
           if (!manager.isInProject(overriding)) continue;
+          
+          final boolean applicable = AnnotationUtil.isAnnotatingApplicable(overriding, defaultNotNull);
           if (!methodQuickFixSuggested
               && annotated.isDeclaredNotNull
               && !nullableManager.isNotNull(overriding, false) 
               && (nullableManager.isNullable(overriding, false) || !nullableManager.isNullable(overriding, true))) {
             method.getNameIdentifier(); //load tree
-            PsiAnnotation annotation = AnnotationUtil.findAnnotation(method, nullableManager.getNotNulls());
-            final String defaultNotNull = nullableManager.getDefaultNotNull();
+            PsiAnnotation annotation = AnnotationUtil.findAnnotation(method, nullableManager.getNotNulls());            
             final String[] annotationsToRemove = ArrayUtil.toStringArray(nullableManager.getNullables());
+
+            final LocalQuickFix fix;
+            if (applicable) {
+              fix = new MyAnnotateMethodFix(defaultNotNull, annotationsToRemove);
+            }
+            else {
+              fix = superMethodApplicable ? null : createChangeDefaultNotNullFix(nullableManager, method);
+            }
+
             holder.registerProblem(annotation, InspectionsBundle.message("nullable.stuff.problems.overridden.methods.are.not.annotated"),
                                    ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-                                   new MyAnnotateMethodFix(defaultNotNull, annotationsToRemove));
+                                   wrapFix(fix));
             methodQuickFixSuggested = true;
           }
           if (hasAnnotatedParameter) {
@@ -363,7 +390,7 @@ public class NullableStuffInspection extends BaseLocalInspectionTool {
                 holder.registerProblem(annotation,
                                        InspectionsBundle.message("nullable.stuff.problems.overridden.method.parameters.are.not.annotated"),
                                        ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-                                       new AnnotateOverriddenMethodParameterFix(nullableManager.getDefaultNotNull(), nullableManager.getDefaultNullable()));
+                                       wrapFix(!applicable ? createChangeDefaultNotNullFix(nullableManager, parameters[i]) : new AnnotateOverriddenMethodParameterFix(defaultNotNull, nullableManager.getDefaultNullable())));
                 parameterQuickFixSuggested[i] = true;
               }
             }
@@ -373,6 +400,19 @@ public class NullableStuffInspection extends BaseLocalInspectionTool {
     }
   }
 
+  private static LocalQuickFix[] wrapFix(LocalQuickFix fix) {
+    if (fix == null) return LocalQuickFix.EMPTY_ARRAY;
+    return new LocalQuickFix[]{fix};
+  }
+
+  private static LocalQuickFix createChangeDefaultNotNullFix(NullableNotNullManager nullableManager, PsiModifierListOwner modifierListOwner) {
+    final PsiAnnotation annotation = AnnotationUtil.findAnnotation(modifierListOwner, nullableManager.getNotNulls());
+    if (annotation != null) {
+      return new ChangeNullableDefaultsFix(annotation.getQualifiedName(), null, nullableManager);
+    }
+    return null;
+  }
+
   protected AnnotateMethodFix createAnnotateMethodFix(final String defaultNotNull, final String[] annotationsToRemove) {
     return new AnnotateMethodFix(defaultNotNull, annotationsToRemove);
   }
diff --git a/java/java-impl/src/com/intellij/openapi/module/BasePackageParameterFactory.java b/java/java-impl/src/com/intellij/openapi/module/BasePackageParameterFactory.java
index e2f3308f7ef2..809f65d80d7d 100644
--- a/java/java-impl/src/com/intellij/openapi/module/BasePackageParameterFactory.java
+++ b/java/java-impl/src/com/intellij/openapi/module/BasePackageParameterFactory.java
@@ -60,7 +60,7 @@ public class BasePackageParameterFactory extends ProjectTemplateParameterFactory
 
       @Override
       public String getLabel() {
-        return "Base package:";
+        return "Base \u001Bpackage:";
       }
 
       @Override
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
index ae1e9773bc8c..15716567cab7 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
@@ -78,63 +78,10 @@ public class ImportHelper{
       }
     });
 
-    int[] entryForName = ArrayUtil.newIntArray(names.size());
-    PackageEntry[] entries = mySettings.IMPORT_LAYOUT_TABLE.getEntries();
-    for(int i = 0; i < names.size(); i++){
-      Pair<String, Boolean> pair = names.get(i);
-      String packageName = pair.getFirst();
-      Boolean isStatic = pair.getSecond();
-      entryForName[i] = findEntryIndex(packageName, isStatic, entries);
-    }
-
-    List<Pair<String, Boolean>> resultList = new ArrayList<Pair<String, Boolean>>(names.size());
-    for(int i = 0; i < entries.length; i++){
-      for(int j = 0; j < names.size(); j++){
-        if (entryForName[j] == i){
-          resultList.add(names.get(j));
-          names.set(j, null);
-        }
-      }
-    }
-    for (Pair<String, Boolean> name : names) {
-      if (name != null) resultList.add(name);
-    }
-
-    TObjectIntHashMap<String> packageToCountMap = new TObjectIntHashMap<String>();
-    TObjectIntHashMap<String> classToCountMap = new TObjectIntHashMap<String>();
-    for (Pair<String, Boolean> pair : resultList) {
-      String name = pair.getFirst();
-      Boolean isStatic = pair.getSecond();
-      String packageOrClassName = getPackageOrClassName(name);
-      if (packageOrClassName.length() == 0) continue;
-      if (isStatic) {
-        int count = classToCountMap.get(packageOrClassName);
-        classToCountMap.put(packageOrClassName, count + 1);
-      }
-      else {
-        int count = packageToCountMap.get(packageOrClassName);
-        packageToCountMap.put(packageOrClassName, count + 1);
-      }
-    }
+    List<Pair<String, Boolean>> resultList = sortItemsAccordingToSettings(names, mySettings);
 
     final Set<String> classesOrPackagesToImportOnDemand = new THashSet<String>();
-    class MyVisitorProcedure implements TObjectIntProcedure<String> {
-      private final boolean myIsVisitingPackages;
-
-      MyVisitorProcedure(boolean isVisitingPackages) {
-        myIsVisitingPackages = isVisitingPackages;
-      }
-
-      @Override
-      public boolean execute(final String packageOrClassName, final int count) {
-        if (isToUseImportOnDemand(packageOrClassName, count, !myIsVisitingPackages)){
-          classesOrPackagesToImportOnDemand.add(packageOrClassName);
-        }
-        return true;
-      }
-    }
-    classToCountMap.forEachEntry(new MyVisitorProcedure(false));
-    packageToCountMap.forEachEntry(new MyVisitorProcedure(true));
+    collectOnDemandImports(resultList, classesOrPackagesToImportOnDemand, ImportHelper.this.mySettings);
 
     Set<String> classesToUseSingle = findSingleImports(file, resultList, classesOrPackagesToImportOnDemand);
     Set<String> toReimport = new THashSet<String>();
@@ -176,6 +123,71 @@ public class ImportHelper{
     }
   }
 
+  public static void collectOnDemandImports(List<Pair<String, Boolean>> resultList,
+                                            final Set<String> classesOrPackagesToImportOnDemand, 
+                                            final CodeStyleSettings settings) {
+    TObjectIntHashMap<String> packageToCountMap = new TObjectIntHashMap<String>();
+    TObjectIntHashMap<String> classToCountMap = new TObjectIntHashMap<String>();
+    for (Pair<String, Boolean> pair : resultList) {
+      String name = pair.getFirst();
+      Boolean isStatic = pair.getSecond();
+      String packageOrClassName = getPackageOrClassName(name);
+      if (packageOrClassName.length() == 0) continue;
+      if (isStatic) {
+        int count = classToCountMap.get(packageOrClassName);
+        classToCountMap.put(packageOrClassName, count + 1);
+      }
+      else {
+        int count = packageToCountMap.get(packageOrClassName);
+        packageToCountMap.put(packageOrClassName, count + 1);
+      }
+    }
+
+
+    class MyVisitorProcedure implements TObjectIntProcedure<String> {
+      private final boolean myIsVisitingPackages;
+
+      MyVisitorProcedure(boolean isVisitingPackages) {
+        myIsVisitingPackages = isVisitingPackages;
+      }
+
+      @Override
+      public boolean execute(final String packageOrClassName, final int count) {
+        if (isToUseImportOnDemand(packageOrClassName, count, !myIsVisitingPackages, settings)){
+          classesOrPackagesToImportOnDemand.add(packageOrClassName);
+        }
+        return true;
+      }
+    }
+    classToCountMap.forEachEntry(new MyVisitorProcedure(false));
+    packageToCountMap.forEachEntry(new MyVisitorProcedure(true));
+  }
+
+  public static List<Pair<String, Boolean>> sortItemsAccordingToSettings(List<Pair<String, Boolean>> names, final CodeStyleSettings settings) {
+    int[] entryForName = ArrayUtil.newIntArray(names.size());
+    PackageEntry[] entries = settings.IMPORT_LAYOUT_TABLE.getEntries();
+    for(int i = 0; i < names.size(); i++){
+      Pair<String, Boolean> pair = names.get(i);
+      String packageName = pair.getFirst();
+      Boolean isStatic = pair.getSecond();
+      entryForName[i] = findEntryIndex(packageName, isStatic, entries);
+    }
+
+    List<Pair<String, Boolean>> resultList = new ArrayList<Pair<String, Boolean>>(names.size());
+    for(int i = 0; i < entries.length; i++){
+      for(int j = 0; j < names.size(); j++){
+        if (entryForName[j] == i){
+          resultList.add(names.get(j));
+          names.set(j, null);
+        }
+      }
+    }
+    for (Pair<String, Boolean> name : names) {
+      if (name != null) resultList.add(name);
+    }
+    return resultList;
+  }
+
   @NotNull
   private static Set<String> findSingleImports(@NotNull final PsiJavaFile file,
                                                @NotNull List<Pair<String,Boolean>> names,
@@ -620,13 +632,16 @@ public class ImportHelper{
     return maxSpace;
   }
 
-  private boolean isToUseImportOnDemand(@NotNull String packageName, int classCount, boolean isStaticImportNeeded){
-    if (!mySettings.USE_SINGLE_CLASS_IMPORTS) return true;
-    int limitCount = isStaticImportNeeded ? mySettings.NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND :
-                     mySettings.CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND;
+  private static boolean isToUseImportOnDemand(@NotNull String packageName,
+                                               int classCount,
+                                               boolean isStaticImportNeeded,
+                                               final CodeStyleSettings settings){
+    if (!settings.USE_SINGLE_CLASS_IMPORTS) return true;
+    int limitCount = isStaticImportNeeded ? settings.NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND :
+                     settings.CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND;
     if (classCount >= limitCount) return true;
     if (packageName.length() == 0) return false;
-    PackageEntryTable table = mySettings.PACKAGES_TO_USE_IMPORT_ON_DEMAND;
+    PackageEntryTable table = settings.PACKAGES_TO_USE_IMPORT_ON_DEMAND;
     return table != null && table.contains(packageName);
   }
 
diff --git a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
index 0ca2c3709680..d67dec73361f 100644
--- a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
+++ b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
@@ -293,9 +293,13 @@ public class AnnotationUtil {
   }
 
   public static boolean isAnnotatingApplicable(@NotNull PsiElement elt) {
+    return isAnnotatingApplicable(elt, NullableNotNullManager.getInstance(elt.getProject()).getDefaultNullable());
+  }
+
+  public static boolean isAnnotatingApplicable(@NotNull PsiElement elt, final String annotationFQN) {
     final Project project = elt.getProject();
     return PsiUtil.isLanguageLevel5OrHigher(elt) &&
-           JavaPsiFacade.getInstance(project).findClass(NullableNotNullManager.getInstance(project).getDefaultNullable(), elt.getResolveScope()) != null;
+           JavaPsiFacade.getInstance(project).findClass(annotationFQN, elt.getResolveScope()) != null;
   }
 
   public static boolean isJetbrainsAnnotation(@NonNls final String simpleName) {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java
index 05b5a6b86a1f..b49a615f0285 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,10 @@ import com.intellij.psi.*;
 import com.intellij.psi.impl.java.stubs.JavaStubElementTypes;
 import com.intellij.psi.impl.java.stubs.PsiImportListStub;
 import com.intellij.psi.impl.source.tree.ElementType;
-import com.intellij.util.containers.HashMap;
+import com.intellij.psi.impl.source.tree.JavaElementType;
+import com.intellij.psi.tree.TokenSet;
 import com.intellij.util.ArrayFactory;
+import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
@@ -63,17 +65,19 @@ public class PsiImportListImpl extends JavaStubPsiElement<PsiImportListStub> imp
     super.subtreeChanged();
   }
 
+  private static final TokenSet IMPORT_STATEMENT_BIT_SET = TokenSet.create(JavaElementType.IMPORT_STATEMENT);
+  private static final TokenSet IMPORT_STATIC_STATEMENT_BIT_SET = TokenSet.create(JavaElementType.IMPORT_STATIC_STATEMENT);
+
   @Override
   @NotNull
   public PsiImportStatement[] getImportStatements() {
-    return getStubOrPsiChildren(ElementType.IMPORT_STATEMENT_BIT_SET, PsiImportStatementImpl.ARRAY_FACTORY);
+    return getStubOrPsiChildren(IMPORT_STATEMENT_BIT_SET, PsiImportStatementImpl.ARRAY_FACTORY);
   }
 
   @Override
   @NotNull
   public PsiImportStaticStatement[] getImportStaticStatements() {
-    return getStubOrPsiChildren(ElementType.IMPORT_STATIC_STATEMENT_BIT_SET, PsiImportStaticStatementImpl.ARRAY_FACTORY);
-
+    return getStubOrPsiChildren(IMPORT_STATIC_STATEMENT_BIT_SET, PsiImportStaticStatementImpl.ARRAY_FACTORY);
   }
 
   @Override
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
index 5af0d2dae5b3..6f0b5c6a4ec4 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
@@ -205,6 +205,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
       sortLambdaExpressionsLast(paramTypes, argTypes);
       boolean rawType = false;
       boolean nullPassed = false;
+      boolean lambdaRaw = false;
       for (int j = 0; j < argTypes.length; j++) {
         PsiType argumentType = argTypes[j];
         if (argumentType == null) continue;
@@ -228,6 +229,12 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
             if (currentSubstitution == FAILED_INFERENCE || (currentSubstitution == null && lowerBound == PsiType.NULL)) return RAW_INFERENCE;
           }
           if (nullPassed && currentSubstitution == null) return RAW_INFERENCE;
+          if (currentSubstitution != null && currentSubstitution.first == null) {
+            lambdaRaw = true;
+          }
+          if (currentSubstitution == null && lambdaRaw) {
+            return new Pair<PsiType, ConstraintType>(PsiType.getJavaLangObject(typeParameter.getManager(), typeParameter.getResolveScope()), ConstraintType.EQUALS);
+          }
         } else if (argumentType instanceof PsiMethodReferenceType) {
           final PsiMethodReferenceExpression referenceExpression = ((PsiMethodReferenceType)argumentType).getExpression();
           currentSubstitution = inferConstraintFromFunctionalInterfaceMethod(typeParameter, referenceExpression, partialSubstitutor.substitute(parameterType), partialSubstitutor, policy);
@@ -998,7 +1005,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
     return null;
   }
 
-  private static Pair<PsiType, ConstraintType> inferMethodTypeParameterFromParent(PsiElement parent,
+  private static Pair<PsiType, ConstraintType> inferMethodTypeParameterFromParent(final PsiElement parent,
                                                                                   PsiExpression methodCall,
                                                                                   final PsiTypeParameter typeParameter,
                                                                                   PsiSubstitutor substitutor,
@@ -1065,16 +1072,24 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
         }
       }
     } else if (parent instanceof PsiLambdaExpression) {
-      expectedType = LambdaUtil.getFunctionalInterfaceReturnType(((PsiLambdaExpression)parent).getFunctionalInterfaceType());
+      expectedType = ourGraphGuard.doPreventingRecursion(methodCall, true, new Computable<PsiType>() {
+        @Override
+        public PsiType compute() {
+          return LambdaUtil.getFunctionalInterfaceReturnType(((PsiLambdaExpression)parent).getFunctionalInterfaceType()); 
+        }
+      });
       if (expectedType == null) {
-        return getFailedInferenceConstraint(typeParameter);
+        return null;
       }
     } else if (parent instanceof PsiTypeCastExpression) {
       expectedType = ((PsiTypeCastExpression)parent).getType();
     } else if (parent instanceof PsiConditionalExpression) {
       if (PsiUtil.isLanguageLevel8OrHigher(parent)) {
         try {
-          return inferMethodTypeParameterFromParent(PsiUtil.skipParenthesizedExprUp(parent.getParent()), (PsiExpression)parent, typeParameter, substitutor, policy);
+          final Pair<PsiType, ConstraintType> pair = inferFromConditionalExpression(parent, methodCall, typeParameter, substitutor, policy);
+          if (pair != null) {
+            return pair;
+          }
         }
         finally {
           GraphInferencePolicy.forget(parent);
@@ -1175,6 +1190,42 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
     return result;
   }
 
+  private static Pair<PsiType, ConstraintType> inferFromConditionalExpression(PsiElement parent,
+                                                                              PsiExpression methodCall,
+                                                                              PsiTypeParameter typeParameter,
+                                                                              PsiSubstitutor substitutor,
+                                                                              ParameterTypeInferencePolicy policy) {
+    Pair<PsiType, ConstraintType> pair =
+      inferMethodTypeParameterFromParent(PsiUtil.skipParenthesizedExprUp(parent.getParent()), (PsiExpression)parent, typeParameter, substitutor, policy);
+    if (pair == null) {
+      final PsiExpression thenExpression = ((PsiConditionalExpression)parent).getThenExpression();
+      final PsiExpression elseExpression = ((PsiConditionalExpression)parent).getElseExpression();
+      final PsiType[] paramTypes = {((PsiMethod)typeParameter.getOwner()).getReturnType()};
+      if (methodCall.equals(PsiUtil.skipParenthesizedExprDown(elseExpression)) && thenExpression != null) {
+        final PsiType thenType = ourGraphGuard.doPreventingRecursion(thenExpression, true, new Computable<PsiType>() {
+          @Override
+          public PsiType compute() {
+            return thenExpression.getType();
+          }
+        });
+        if (thenType != null) {
+          pair = inferTypeForMethodTypeParameterInner(typeParameter, paramTypes, new PsiType[] {thenType}, substitutor, null, policy);
+        }
+      } else if (methodCall.equals(PsiUtil.skipParenthesizedExprDown(thenExpression)) && elseExpression != null) {
+        final PsiType elseType = ourGraphGuard.doPreventingRecursion(elseExpression, true, new Computable<PsiType>() {
+          @Override
+          public PsiType compute() {
+            return elseExpression.getType(); 
+          }
+        });
+        if (elseType != null) {
+          pair = inferTypeForMethodTypeParameterInner(typeParameter, paramTypes, new PsiType[] {elseType}, substitutor, null, policy);
+        }
+      }
+    }
+    return pair;
+  }
+
   private static final ProcessCandidateParameterTypeInferencePolicy GRAPH_INFERENCE_POLICY = new GraphInferencePolicy();
 
   private static Pair<PsiType, ConstraintType> graphInferenceFromCallContext(@NotNull final PsiExpression methodCall,
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
index eb8328047d1e..b61fb3d147f5 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,12 +70,8 @@ public interface ElementType extends JavaTokenType, JavaDocTokenType, JavaElemen
     WHILE_STATEMENT, FOR_STATEMENT, FOREACH_STATEMENT, DO_WHILE_STATEMENT, SWITCH_STATEMENT, SWITCH_LABEL_STATEMENT, BREAK_STATEMENT,
     CONTINUE_STATEMENT, RETURN_STATEMENT, THROW_STATEMENT, SYNCHRONIZED_STATEMENT, TRY_STATEMENT, LABELED_STATEMENT, ASSERT_STATEMENT);
 
-  TokenSet TYPES_BIT_SET = TokenSet.create(TYPE);
-  TokenSet IMPORT_STATEMENT_BIT_SET = TokenSet.create(IMPORT_STATEMENT);
-  TokenSet IMPORT_STATIC_STATEMENT_BIT_SET = TokenSet.create(IMPORT_STATIC_STATEMENT);
   TokenSet IMPORT_STATEMENT_BASE_BIT_SET = TokenSet.create(IMPORT_STATEMENT, IMPORT_STATIC_STATEMENT);
   TokenSet CLASS_KEYWORD_BIT_SET = TokenSet.create(CLASS_KEYWORD, INTERFACE_KEYWORD, ENUM_KEYWORD);
   TokenSet MEMBER_BIT_SET = TokenSet.create(CLASS, FIELD, ENUM_CONSTANT, METHOD, ANNOTATION_METHOD);
   TokenSet FULL_MEMBER_BIT_SET = TokenSet.orSet(MEMBER_BIT_SET, TokenSet.create(CLASS_INITIALIZER));
-  TokenSet ANNOTATIONS = TokenSet.create(ANNOTATION);
 }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java
index e3830e5d6be8..8b33ab278903 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -214,7 +214,7 @@ public class ClassElement extends CompositeElement implements Constants {
         }
       }
     }
-    
+
     super.deleteChildInternal(child);
   }
 
@@ -364,7 +364,7 @@ public class ClassElement extends CompositeElement implements Constants {
     else if (i == JavaDocElementType.DOC_COMMENT) {
       return getChildRole(child, ChildRole.DOC_COMMENT);
     }
-    else if (i == C_STYLE_COMMENT || i == END_OF_LINE_COMMENT) {
+    else if (ElementType.JAVA_PLAIN_COMMENT_BIT_SET.contains(i)) {
       return ChildRoleBase.NONE;
     }
     else if (i == MODIFIER_LIST) {
@@ -376,7 +376,7 @@ public class ClassElement extends CompositeElement implements Constants {
     else if (i == IMPLEMENTS_LIST) {
       return ChildRole.IMPLEMENTS_LIST;
     }
-    else if (i == CLASS_KEYWORD || i == INTERFACE_KEYWORD || i == ENUM_KEYWORD) {
+    else if (ElementType.CLASS_KEYWORD_BIT_SET.contains(i)) {
       return getChildRole(child, ChildRole.CLASS_OR_INTERFACE_KEYWORD);
     }
     else if (i == IDENTIFIER) {
@@ -403,5 +403,4 @@ public class ClassElement extends CompositeElement implements Constants {
   protected boolean isVisibilitySupported() {
     return true;
   }
-
 }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java
index 0cdbf5c21e5a..e85e81cb4bd8 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public class PsiReferenceParameterListImpl extends CompositePsiElement implement
   @Override
   @NotNull
   public PsiTypeElement[] getTypeParameterElements() {
-    return getChildrenAsPsiElements(ElementType.TYPES_BIT_SET, PsiTypeElement.ARRAY_FACTORY);
+    return getChildrenAsPsiElements(JavaElementType.TYPE, PsiTypeElement.ARRAY_FACTORY);
   }
 
   @Override
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java
index d56a69b0bfb7..12bc9fb34ca2 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,8 +28,6 @@ import com.intellij.psi.impl.java.stubs.PsiTypeParameterStub;
 import com.intellij.psi.impl.light.LightEmptyImplementsList;
 import com.intellij.psi.impl.meta.MetaRegistry;
 import com.intellij.psi.impl.source.JavaStubPsiElement;
-import com.intellij.psi.impl.source.tree.ChildRole;
-import com.intellij.psi.impl.source.tree.ElementType;
 import com.intellij.psi.javadoc.PsiDocComment;
 import com.intellij.psi.meta.PsiMetaData;
 import com.intellij.psi.scope.PsiScopeProcessor;
@@ -44,7 +42,7 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- *  @author dsl
+ * @author dsl
  */
 public class PsiTypeParameterImpl extends JavaStubPsiElement<PsiTypeParameterStub> implements PsiTypeParameter {
   private final LightEmptyImplementsList myLightEmptyImplementsList = new LightEmptyImplementsList(null) {
@@ -169,7 +167,7 @@ public class PsiTypeParameterImpl extends JavaStubPsiElement<PsiTypeParameterStu
       return PsiTreeUtil.getParentOfType(this, PsiTypeParameterListOwner.class);
     }
 
-    return (PsiTypeParameterListOwner) parentParent;
+    return (PsiTypeParameterListOwner)parentParent;
   }
 
 
@@ -183,9 +181,10 @@ public class PsiTypeParameterImpl extends JavaStubPsiElement<PsiTypeParameterStu
 
     int ret = 0;
     PsiElement element = getPrevSibling();
-    while(element != null){
-      if(element instanceof PsiTypeParameter)
+    while (element != null) {
+      if (element instanceof PsiTypeParameter) {
         ret++;
+      }
       element = element.getPrevSibling();
     }
     return ret;
@@ -194,11 +193,14 @@ public class PsiTypeParameterImpl extends JavaStubPsiElement<PsiTypeParameterStu
   @Override
   @NotNull
   public PsiIdentifier getNameIdentifier() {
-    return (PsiIdentifier) calcTreeElement().findChildByRole(ChildRole.NAME);
+    return PsiTreeUtil.getRequiredChildOfType(this, PsiIdentifier.class);
   }
 
   @Override
-  public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place){
+  public boolean processDeclarations(@NotNull PsiScopeProcessor processor,
+                                     @NotNull ResolveState state,
+                                     PsiElement lastParent,
+                                     @NotNull PsiElement place) {
     return PsiClassImplUtil.processDeclarationsInClass(this, processor, state, null, lastParent, place, false);
   }
 
@@ -361,7 +363,7 @@ public class PsiTypeParameterImpl extends JavaStubPsiElement<PsiTypeParameterStu
     return "PsiTypeParameter:" + getName();
   }
 
-  public PsiMetaData getMetaData(){
+  public PsiMetaData getMetaData() {
     return MetaRegistry.getMeta(this);
   }
 
@@ -384,7 +386,7 @@ public class PsiTypeParameterImpl extends JavaStubPsiElement<PsiTypeParameterStu
   @Override
   @NotNull
   public PsiAnnotation[] getAnnotations() {
-    return getStubOrPsiChildren(ElementType.ANNOTATIONS, PsiAnnotation.ARRAY_FACTORY);
+    return getStubOrPsiChildren(JavaStubElementTypes.ANNOTATION, PsiAnnotation.ARRAY_FACTORY);
   }
 
   @Override
@@ -397,6 +399,7 @@ public class PsiTypeParameterImpl extends JavaStubPsiElement<PsiTypeParameterStu
   public PsiAnnotation addAnnotation(@NotNull @NonNls String qualifiedName) {
     throw new IncorrectOperationException();
   }
+
   @Override
   @NotNull
   public PsiAnnotation[] getApplicableAnnotations() {
diff --git a/java/java-tests/testData/codeInsight/completion/normalSorting/EnumConstantStartMatching.java b/java/java-tests/testData/codeInsight/completion/normalSorting/EnumConstantStartMatching.java
new file mode 100644
index 000000000000..1521cfd0521f
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normalSorting/EnumConstantStartMatching.java
@@ -0,0 +1,12 @@
+public class Foo {
+  
+  Zoo foo() {
+    return r<caret>
+  }
+
+  void rMethod() {}
+}
+
+enum Zoo {
+  LEFT, RIGHT
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AcceptRawSubstForLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AcceptRawSubstForLambda.java
new file mode 100644
index 000000000000..9f7573f82c4a
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AcceptRawSubstForLambda.java
@@ -0,0 +1,30 @@
+public class CyclicReferenceTest {
+    void test(Match<String, Integer> match) {
+        Match<String, Integer> matcher = match.or(s -> Optional.empty(), i -> 2);
+        Match<String, Integer> matcher1 = match.or(s -> s.startsWith("_") ? Optional.of(1) : Optional.empty(), i -> 2);
+    }
+}
+
+class Match<T, V> {
+    public <W> Match<T, V> or(Extractor<T, W> e, Function<W, V> c) {
+        return this;
+    }
+}
+
+interface Extractor<T, W> {
+    Optional<W> unapply(T t);
+}
+
+interface Function<W, V> {
+    public V apply(W t);
+}
+
+class Optional<W> {
+    public static <T> Optional<T> empty() {
+        return null;
+    }
+  
+    public static <T> Optional<T> of(T value) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/NotNullCatchParameter.java b/java/java-tests/testData/inspection/dataFlow/fixture/NotNullCatchParameter.java
new file mode 100644
index 000000000000..cb8849b090d7
--- /dev/null
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/NotNullCatchParameter.java
@@ -0,0 +1,21 @@
+class MyException extends Exception {}
+
+class Foo {
+  public static void main(String[] args) {
+    try {
+      bar();
+    } catch (Exception e) {
+      if (e instanceof MyException) {
+        return;
+      }
+      if (<warning descr="Condition 'e instanceof RuntimeException' is always 'true'">e instanceof RuntimeException</warning>) {
+        return;
+      }
+      e.printStackTrace();
+    }
+  }
+
+  private static void bar() throws MyException {
+  }
+
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
index d9fa374fbe7e..c1fc757f89e5 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
@@ -98,11 +98,11 @@ public class NormalCompletionOrderingTest extends CompletionSortingTestCase {
   }
 
   public void testDispreferDeclared() throws Throwable {
-    checkPreferredItems(0, "aabbb", "aaa");
+    checkPreferredItems(0, "aabbb", "Aaaaaaa", "aaa");
   }
 
   public void testDispreferDeclaredOfExpectedType() throws Throwable {
-    checkPreferredItems(0, "aabbb", "aaa");
+    checkPreferredItems(0, "aabbb", "Aaaaaaa", "aaa");
   }
 
   public void testDispreferImpls() throws Throwable {
@@ -596,4 +596,12 @@ import java.lang.annotation.Target;
     assertPreferredItems 0, 'setText', 'setOurText'
   }
 
+  public void testEnumConstantStartMatching() {
+    checkPreferredItems(0, 'rMethod', 'Zoo.RIGHT')
+    myFixture.type('i\n;\nreturn r')
+    myFixture.completeBasic()
+    assertPreferredItems 0, 'Zoo.RIGHT', 'rMethod'
+
+  }
+
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java
index fb83818521de..53fa466743e8 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java
@@ -216,6 +216,10 @@ public class LambdaHighlightingTest extends LightDaemonAnalyzerTestCase {
     doTest();
   }
 
+  public void testAcceptRawSubstForLambda() throws Exception {
+    doTest();
+  }
+
   public void testCheckFunctionalInterfaceAccess() throws Exception {
     doTest();
   }
diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
index 56fa8115d95f..eb2ec6a3fd5a 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
@@ -90,6 +90,7 @@ public class DataFlowInspectionTest extends LightCodeInsightFixtureTestCase {
   public void testReturningNullFromVoidMethod() throws Throwable { doTest(); }
 
   public void testCatchRuntimeException() throws Throwable { doTest(); }
+  public void testNotNullCatchParameter() { doTest(); }
 
   public void testAssertFailInCatch() throws Throwable {
     myFixture.addClass("package org.junit; public class Assert { public static void fail() {}}");
diff --git a/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureFilteringTest.java b/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureFilteringTest.java
index e2632105a56c..abbb1522855d 100644
--- a/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureFilteringTest.java
+++ b/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureFilteringTest.java
@@ -38,10 +38,10 @@ public class JavaFileStructureFilteringTest extends JavaFileStructureTestCase {
   public void testSelectLeafFirst3()  throws Exception {checkTree("clear");}
   public void testSelectLeafFirst4()  throws Exception {checkTree("clear");}
 
-  @Bombed(user = "peter", month = Calendar.MARCH, day = 1)
+  @Bombed(user = "peter", month = Calendar.MAY, day = 10)
   public void testMatcher1()          throws Exception {checkTree("ico");}
-  @Bombed(user = "peter", month = Calendar.MARCH, day = 1)
+  @Bombed(user = "peter", month = Calendar.MAY, day = 10)
   public void testMatcher2()          throws Exception {checkTree("ico");}
-  @Bombed(user = "peter", month = Calendar.MARCH, day = 1)
+  @Bombed(user = "peter", month = Calendar.MAY, day = 10)
   public void testAnonymousMatcher2() throws Exception {checkTree("ico");}
 }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/GlobalOptions.java b/jps/jps-builders/src/org/jetbrains/jps/api/GlobalOptions.java
index d772b3c6c1b4..67073eb67b94 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/api/GlobalOptions.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/api/GlobalOptions.java
@@ -25,4 +25,5 @@ public interface GlobalOptions {
   String GENERATE_CLASSPATH_INDEX_OPTION = "generate.classpath.index";
   String COMPILE_PARALLEL_OPTION = "compile.parallel";
   String COMPILE_PARALLEL_MAX_THREADS_OPTION = "compile.parallel.max.threads";
+  String REBUILD_ON_DEPENDENCY_CHANGE_OPTION = "rebuild.on.dependency.change";
 }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/BuildOperations.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/BuildOperations.java
index c924d6d5e345..25effec23dca 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/BuildOperations.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/BuildOperations.java
@@ -22,10 +22,13 @@ import org.jetbrains.jps.builders.*;
 import org.jetbrains.jps.builders.impl.BuildOutputConsumerImpl;
 import org.jetbrains.jps.builders.impl.BuildTargetChunk;
 import org.jetbrains.jps.builders.impl.DirtyFilesHolderBase;
+import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType;
 import org.jetbrains.jps.builders.logging.ProjectBuilderLogger;
 import org.jetbrains.jps.builders.storage.SourceToOutputMapping;
 import org.jetbrains.jps.cmdline.ProjectDescriptor;
 import org.jetbrains.jps.incremental.fs.BuildFSState;
+import org.jetbrains.jps.incremental.messages.BuildMessage;
+import org.jetbrains.jps.incremental.messages.CompilerMessage;
 import org.jetbrains.jps.incremental.messages.DoneSomethingNotification;
 import org.jetbrains.jps.incremental.messages.FileDeletedEvent;
 import org.jetbrains.jps.incremental.storage.BuildDataManager;
@@ -48,17 +51,25 @@ public class BuildOperations {
     final ProjectDescriptor pd = context.getProjectDescriptor();
     final Timestamps timestamps = pd.timestamps.getStorage();
     final BuildTargetConfiguration configuration = pd.getTargetsState().getTargetConfiguration(target);
-
+    boolean isTargetConfigChange = false;
     if (context.isProjectRebuild()) {
       FSOperations.markDirtyFiles(context, target, timestamps, true, null, null);
       pd.fsState.markInitialScanPerformed(target);
       configuration.save();
     }
-    else if (context.getScope().isRecompilationForced(target) || configuration.isTargetDirty() || configuration.outputRootWasDeleted(context)) {
+    else if (context.getScope().isRecompilationForced(target) ||
+             (isTargetConfigChange = configuration.isTargetDirty()) ||
+             configuration.outputRootWasDeleted(context)) {
       initTargetFSState(context, target, true);
       IncProjectBuilder.clearOutputFiles(context, target);
       pd.dataManager.cleanTargetStorages(target);
       configuration.save();
+
+      if (isTargetConfigChange && ModuleBuildTarget.REBUILD_ON_DEPENDENCY_CHANGE && JavaModuleBuildTargetType.PRODUCTION.equals(target.getTargetType())) {
+        final String moduleName = ((ModuleBuildTarget)target).getModule().getName();
+        context.processMessage(new CompilerMessage("", BuildMessage.Kind.INFO, "Rebuilding module \"" + moduleName + "\" because of dependencies change"));
+      }
+
     }
     else if (!pd.fsState.isInitialScanPerformed(target)) {
       initTargetFSState(context, target, false);
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleBuildTarget.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleBuildTarget.java
index e27534b98d40..2ae917dcf319 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleBuildTarget.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleBuildTarget.java
@@ -22,6 +22,7 @@ import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.ProjectPaths;
+import org.jetbrains.jps.api.GlobalOptions;
 import org.jetbrains.jps.builders.*;
 import org.jetbrains.jps.builders.java.ExcludedJavaSourceRootProvider;
 import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType;
@@ -50,6 +51,9 @@ import java.util.Set;
  * @author nik
  */
 public final class ModuleBuildTarget extends JVMModuleBuildTarget<JavaSourceRootDescriptor> {
+  public static final Boolean REBUILD_ON_DEPENDENCY_CHANGE = Boolean.valueOf(
+    System.getProperty(GlobalOptions.REBUILD_ON_DEPENDENCY_CHANGE_OPTION, "true")
+  );
   private final JavaModuleBuildTargetType myTargetType;
 
   public ModuleBuildTarget(@NotNull JpsModule module, JavaModuleBuildTargetType targetType) {
@@ -169,10 +173,13 @@ public final class ModuleBuildTarget extends JVMModuleBuildTarget<JavaSourceRoot
   }
 
   private int getDependenciesFingerprint() {
-    final JpsModule module = getModule();
-
     int fingerprint = 0;
 
+    if (!REBUILD_ON_DEPENDENCY_CHANGE) {
+      return fingerprint;
+    }
+
+    final JpsModule module = getModule();
     JpsJavaDependenciesEnumerator enumerator = JpsJavaExtensionService.dependencies(module).compileOnly();
     if (!isTests()) {
       enumerator = enumerator.productionOnly();
diff --git a/lib/src/winp-1.16-patched-src.zip b/lib/src/winp-1.16-patched-src.zip
deleted file mode 100644
index fb96ffb2ea2a..000000000000
Binary files a/lib/src/winp-1.16-patched-src.zip and /dev/null differ
diff --git a/lib/src/winp-1.17-patched-src.zip b/lib/src/winp-1.17-patched-src.zip
new file mode 100644
index 000000000000..02f7972bc776
Binary files /dev/null and b/lib/src/winp-1.17-patched-src.zip differ
diff --git a/lib/winp-1.16-patched.jar b/lib/winp-1.16-patched.jar
deleted file mode 100644
index 36dca5299f50..000000000000
Binary files a/lib/winp-1.16-patched.jar and /dev/null differ
diff --git a/lib/winp-1.17-patched.jar b/lib/winp-1.17-patched.jar
new file mode 100644
index 000000000000..21a670e11aba
Binary files /dev/null and b/lib/winp-1.17-patched.jar differ
diff --git a/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java b/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java
index 35026e9d64eb..6670be3590e2 100644
--- a/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java
+++ b/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java
@@ -243,7 +243,7 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw
 
   @NotNull
   public static GlobalSearchScope moduleTestsWithDependentsScope(@NotNull Module module) {
-    return module.getModuleWithDependentsScope();
+    return module.getModuleTestsWithDependentsScope();
   }
 
   @NotNull
diff --git a/platform/dvcs/testFramework/com/intellij/dvcs/test/Executor.java b/platform/dvcs/testFramework/com/intellij/dvcs/test/Executor.java
index bb81acd02ee0..400837369dd6 100644
--- a/platform/dvcs/testFramework/com/intellij/dvcs/test/Executor.java
+++ b/platform/dvcs/testFramework/com/intellij/dvcs/test/Executor.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.CharsetToolkit;
+import com.intellij.openapi.vfs.VirtualFile;
 
 import java.io.File;
 import java.io.IOException;
@@ -53,6 +54,10 @@ public class Executor {
     }
   }
 
+  public static void cd(VirtualFile dir) {
+    cd(dir.getPath());
+  }
+
   public static String pwd() {
     return ourCurrentDir;
   }
@@ -157,15 +162,15 @@ public class Executor {
       for (String dir : path.split(File.pathSeparator)) {
         File file = new File(dir, name);
         if (file.canExecute()) {
-          log("Using $programName from PATH");
+          log("Using " + programName + " from PATH");
           return file.getPath();
         }
       }
     }
 
-    throw new IllegalStateException("$programName executable not found. " +
-                                    "Please define a valid environment variable ${pathEnvs.iterator().next()} " +
-                                    "pointing to the $programName executable.");
+    throw new IllegalStateException(programName + " executable not found. " +
+                                    "Please define a valid environment variable " + pathEnvs.iterator().next() +
+                                    " pointing to the " + programName + " executable.");
   }
 
   protected static void log(String msg) {
diff --git a/platform/extensions/src/com/intellij/openapi/extensions/impl/AreaPicoContainerImpl.java b/platform/extensions/src/com/intellij/openapi/extensions/impl/AreaPicoContainerImpl.java
index 14e81e91e081..099421ab6122 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/impl/AreaPicoContainerImpl.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/AreaPicoContainerImpl.java
@@ -26,7 +26,6 @@ import org.picocontainer.alternatives.AbstractDelegatingMutablePicoContainer;
 /**
  * @author Alexander Kireyev
  */
-@SuppressWarnings({"unchecked"})
 class AreaPicoContainerImpl extends AbstractDelegatingMutablePicoContainer implements AreaPicoContainer {
   private final AreaInstance myAreaInstance;
 
diff --git a/platform/icons/src/frame_background@2x_dark.png b/platform/icons/src/frame_background@2x_dark.png
index 11af1396a9e9..6f5f605a1596 100644
Binary files a/platform/icons/src/frame_background@2x_dark.png and b/platform/icons/src/frame_background@2x_dark.png differ
diff --git a/platform/icons/src/frame_background_dark.png b/platform/icons/src/frame_background_dark.png
index 11af1396a9e9..71b25f083ca6 100644
Binary files a/platform/icons/src/frame_background_dark.png and b/platform/icons/src/frame_background_dark.png differ
diff --git a/platform/icons/src/hierarchy/base@2x.png b/platform/icons/src/hierarchy/base@2x.png
new file mode 100644
index 000000000000..0292f847071a
Binary files /dev/null and b/platform/icons/src/hierarchy/base@2x.png differ
diff --git a/platform/icons/src/hierarchy/callee@2x.png b/platform/icons/src/hierarchy/callee@2x.png
new file mode 100644
index 000000000000..302057bb466b
Binary files /dev/null and b/platform/icons/src/hierarchy/callee@2x.png differ
diff --git a/platform/icons/src/hierarchy/callee@2x_dark.png b/platform/icons/src/hierarchy/callee@2x_dark.png
new file mode 100644
index 000000000000..f09e1d570724
Binary files /dev/null and b/platform/icons/src/hierarchy/callee@2x_dark.png differ
diff --git a/platform/icons/src/hierarchy/caller@2x.png b/platform/icons/src/hierarchy/caller@2x.png
new file mode 100644
index 000000000000..9deead781af4
Binary files /dev/null and b/platform/icons/src/hierarchy/caller@2x.png differ
diff --git a/platform/icons/src/hierarchy/caller@2x_dark.png b/platform/icons/src/hierarchy/caller@2x_dark.png
new file mode 100644
index 000000000000..1bf2383424db
Binary files /dev/null and b/platform/icons/src/hierarchy/caller@2x_dark.png differ
diff --git a/platform/icons/src/hierarchy/class@2x.png b/platform/icons/src/hierarchy/class@2x.png
new file mode 100644
index 000000000000..fbf2ba08a068
Binary files /dev/null and b/platform/icons/src/hierarchy/class@2x.png differ
diff --git a/platform/icons/src/hierarchy/class@2x_dark.png b/platform/icons/src/hierarchy/class@2x_dark.png
new file mode 100644
index 000000000000..a982c924eca8
Binary files /dev/null and b/platform/icons/src/hierarchy/class@2x_dark.png differ
diff --git a/platform/icons/src/hierarchy/methodDefined@2x.png b/platform/icons/src/hierarchy/methodDefined@2x.png
new file mode 100644
index 000000000000..2b8957c59905
Binary files /dev/null and b/platform/icons/src/hierarchy/methodDefined@2x.png differ
diff --git a/platform/icons/src/hierarchy/methodNotDefined@2x.png b/platform/icons/src/hierarchy/methodNotDefined@2x.png
new file mode 100644
index 000000000000..d9961bed1957
Binary files /dev/null and b/platform/icons/src/hierarchy/methodNotDefined@2x.png differ
diff --git a/platform/icons/src/hierarchy/shouldDefineMethod@2x.png b/platform/icons/src/hierarchy/shouldDefineMethod@2x.png
new file mode 100644
index 000000000000..36e222c2cbc5
Binary files /dev/null and b/platform/icons/src/hierarchy/shouldDefineMethod@2x.png differ
diff --git a/platform/icons/src/hierarchy/subtypes@2x.png b/platform/icons/src/hierarchy/subtypes@2x.png
new file mode 100644
index 000000000000..302057bb466b
Binary files /dev/null and b/platform/icons/src/hierarchy/subtypes@2x.png differ
diff --git a/platform/icons/src/hierarchy/subtypes@2x_dark.png b/platform/icons/src/hierarchy/subtypes@2x_dark.png
new file mode 100644
index 000000000000..f09e1d570724
Binary files /dev/null and b/platform/icons/src/hierarchy/subtypes@2x_dark.png differ
diff --git a/platform/icons/src/hierarchy/supertypes@2x.png b/platform/icons/src/hierarchy/supertypes@2x.png
new file mode 100644
index 000000000000..945aa25d175e
Binary files /dev/null and b/platform/icons/src/hierarchy/supertypes@2x.png differ
diff --git a/platform/icons/src/hierarchy/supertypes@2x_dark.png b/platform/icons/src/hierarchy/supertypes@2x_dark.png
new file mode 100644
index 000000000000..1bf2383424db
Binary files /dev/null and b/platform/icons/src/hierarchy/supertypes@2x_dark.png differ
diff --git a/platform/icons/src/idea_logo_background.png b/platform/icons/src/idea_logo_background.png
index fde50bdd1ac7..86352ccfbd15 100644
Binary files a/platform/icons/src/idea_logo_background.png and b/platform/icons/src/idea_logo_background.png differ
diff --git a/platform/icons/src/vcs/allRevisions.png b/platform/icons/src/vcs/allRevisions.png
index 281dfbb7ec29..b3572a45b317 100644
Binary files a/platform/icons/src/vcs/allRevisions.png and b/platform/icons/src/vcs/allRevisions.png differ
diff --git a/platform/icons/src/vcs/allRevisions@2x.png b/platform/icons/src/vcs/allRevisions@2x.png
new file mode 100644
index 000000000000..6e567f3ec7d3
Binary files /dev/null and b/platform/icons/src/vcs/allRevisions@2x.png differ
diff --git a/platform/icons/src/vcs/allRevisions@2x_dark.png b/platform/icons/src/vcs/allRevisions@2x_dark.png
new file mode 100644
index 000000000000..486c7b45bde5
Binary files /dev/null and b/platform/icons/src/vcs/allRevisions@2x_dark.png differ
diff --git a/platform/icons/src/vcs/allRevisions_dark.png b/platform/icons/src/vcs/allRevisions_dark.png
new file mode 100644
index 000000000000..c10997adc355
Binary files /dev/null and b/platform/icons/src/vcs/allRevisions_dark.png differ
diff --git a/platform/icons/src/vcs/arrow_left.png b/platform/icons/src/vcs/arrow_left.png
index dc31e25bd9db..220ec70d51f3 100644
Binary files a/platform/icons/src/vcs/arrow_left.png and b/platform/icons/src/vcs/arrow_left.png differ
diff --git a/platform/icons/src/vcs/arrow_left@2x.png b/platform/icons/src/vcs/arrow_left@2x.png
new file mode 100644
index 000000000000..8e166ab7cc8d
Binary files /dev/null and b/platform/icons/src/vcs/arrow_left@2x.png differ
diff --git a/platform/icons/src/vcs/arrow_right.png b/platform/icons/src/vcs/arrow_right.png
index 96305091ab07..cf182909fb51 100644
Binary files a/platform/icons/src/vcs/arrow_right.png and b/platform/icons/src/vcs/arrow_right.png differ
diff --git a/platform/icons/src/vcs/arrow_right@2x.png b/platform/icons/src/vcs/arrow_right@2x.png
new file mode 100644
index 000000000000..e87edd01e3d5
Binary files /dev/null and b/platform/icons/src/vcs/arrow_right@2x.png differ
diff --git a/platform/icons/src/vcs/checkSpelling.png b/platform/icons/src/vcs/checkSpelling.png
index ebef021e881a..b4977fb506fd 100644
Binary files a/platform/icons/src/vcs/checkSpelling.png and b/platform/icons/src/vcs/checkSpelling.png differ
diff --git a/platform/icons/src/vcs/checkSpelling@2x.png b/platform/icons/src/vcs/checkSpelling@2x.png
new file mode 100644
index 000000000000..e822925c1ca7
Binary files /dev/null and b/platform/icons/src/vcs/checkSpelling@2x.png differ
diff --git a/platform/icons/src/vcs/checkSpelling@2x_dark.png b/platform/icons/src/vcs/checkSpelling@2x_dark.png
new file mode 100644
index 000000000000..566ce20ea467
Binary files /dev/null and b/platform/icons/src/vcs/checkSpelling@2x_dark.png differ
diff --git a/platform/icons/src/vcs/checkSpelling_dark.png b/platform/icons/src/vcs/checkSpelling_dark.png
new file mode 100644
index 000000000000..82b9dc6be493
Binary files /dev/null and b/platform/icons/src/vcs/checkSpelling_dark.png differ
diff --git a/platform/icons/src/vcs/equal.png b/platform/icons/src/vcs/equal.png
index 93db4279059b..c9b5aae892ef 100644
Binary files a/platform/icons/src/vcs/equal.png and b/platform/icons/src/vcs/equal.png differ
diff --git a/platform/icons/src/vcs/equal@2x.png b/platform/icons/src/vcs/equal@2x.png
new file mode 100644
index 000000000000..6af5aed83f25
Binary files /dev/null and b/platform/icons/src/vcs/equal@2x.png differ
diff --git a/platform/icons/src/vcs/history.png b/platform/icons/src/vcs/history.png
index 889ab38795c3..a73b4e7d4055 100644
Binary files a/platform/icons/src/vcs/history.png and b/platform/icons/src/vcs/history.png differ
diff --git a/platform/icons/src/vcs/history@2x.png b/platform/icons/src/vcs/history@2x.png
new file mode 100644
index 000000000000..d90cfadaf181
Binary files /dev/null and b/platform/icons/src/vcs/history@2x.png differ
diff --git a/platform/icons/src/vcs/history@2x_dark.png b/platform/icons/src/vcs/history@2x_dark.png
new file mode 100644
index 000000000000..398bbb2f6fc1
Binary files /dev/null and b/platform/icons/src/vcs/history@2x_dark.png differ
diff --git a/platform/icons/src/vcs/history_dark.png b/platform/icons/src/vcs/history_dark.png
index fc7d8430afd8..6738a71ebe45 100644
Binary files a/platform/icons/src/vcs/history_dark.png and b/platform/icons/src/vcs/history_dark.png differ
diff --git a/platform/icons/src/vcs/messageHistory.png b/platform/icons/src/vcs/messageHistory.png
index 9ac71e7ec590..28ca74c6bbc5 100644
Binary files a/platform/icons/src/vcs/messageHistory.png and b/platform/icons/src/vcs/messageHistory.png differ
diff --git a/platform/icons/src/vcs/messageHistory@2x.png b/platform/icons/src/vcs/messageHistory@2x.png
new file mode 100644
index 000000000000..5b23765858e3
Binary files /dev/null and b/platform/icons/src/vcs/messageHistory@2x.png differ
diff --git a/platform/icons/src/vcs/messageHistory@2x_dark.png b/platform/icons/src/vcs/messageHistory@2x_dark.png
new file mode 100644
index 000000000000..988e13c6ed2b
Binary files /dev/null and b/platform/icons/src/vcs/messageHistory@2x_dark.png differ
diff --git a/platform/icons/src/vcs/messageHistory_dark.png b/platform/icons/src/vcs/messageHistory_dark.png
new file mode 100644
index 000000000000..a7c5aa7b6861
Binary files /dev/null and b/platform/icons/src/vcs/messageHistory_dark.png differ
diff --git a/platform/icons/src/vcs/not_equal.png b/platform/icons/src/vcs/not_equal.png
index ecef12ba3a39..b91d6e7e4516 100644
Binary files a/platform/icons/src/vcs/not_equal.png and b/platform/icons/src/vcs/not_equal.png differ
diff --git a/platform/icons/src/vcs/not_equal@2x.png b/platform/icons/src/vcs/not_equal@2x.png
new file mode 100644
index 000000000000..ab7da6dd01e6
Binary files /dev/null and b/platform/icons/src/vcs/not_equal@2x.png differ
diff --git a/platform/icons/src/vcs/remove@2x.png b/platform/icons/src/vcs/remove@2x.png
new file mode 100644
index 000000000000..fd89bed56bf2
Binary files /dev/null and b/platform/icons/src/vcs/remove@2x.png differ
diff --git a/platform/icons/src/vcs/resetStrip.png b/platform/icons/src/vcs/resetStrip.png
index 922e80cacef9..f688e4844b7f 100644
Binary files a/platform/icons/src/vcs/resetStrip.png and b/platform/icons/src/vcs/resetStrip.png differ
diff --git a/platform/icons/src/vcs/resetStrip@2x.png b/platform/icons/src/vcs/resetStrip@2x.png
new file mode 100644
index 000000000000..68fd3c0283eb
Binary files /dev/null and b/platform/icons/src/vcs/resetStrip@2x.png differ
diff --git a/platform/icons/src/vcs/resetStrip@2x_dark.png b/platform/icons/src/vcs/resetStrip@2x_dark.png
new file mode 100644
index 000000000000..133d1d6d510e
Binary files /dev/null and b/platform/icons/src/vcs/resetStrip@2x_dark.png differ
diff --git a/platform/icons/src/vcs/resetStrip_dark.png b/platform/icons/src/vcs/resetStrip_dark.png
new file mode 100644
index 000000000000..126d9af49bcc
Binary files /dev/null and b/platform/icons/src/vcs/resetStrip_dark.png differ
diff --git a/platform/icons/src/vcs/stripDown.png b/platform/icons/src/vcs/stripDown.png
index ed8a4d0568e1..81b5d3cbec7f 100644
Binary files a/platform/icons/src/vcs/stripDown.png and b/platform/icons/src/vcs/stripDown.png differ
diff --git a/platform/icons/src/vcs/stripDown@2x.png b/platform/icons/src/vcs/stripDown@2x.png
new file mode 100644
index 000000000000..f366a9b01016
Binary files /dev/null and b/platform/icons/src/vcs/stripDown@2x.png differ
diff --git a/platform/icons/src/vcs/stripDown@2x_dark.png b/platform/icons/src/vcs/stripDown@2x_dark.png
new file mode 100644
index 000000000000..a9832539a8ce
Binary files /dev/null and b/platform/icons/src/vcs/stripDown@2x_dark.png differ
diff --git a/platform/icons/src/vcs/stripDown_dark.png b/platform/icons/src/vcs/stripDown_dark.png
new file mode 100644
index 000000000000..e45c994136bf
Binary files /dev/null and b/platform/icons/src/vcs/stripDown_dark.png differ
diff --git a/platform/icons/src/vcs/stripNull.png b/platform/icons/src/vcs/stripNull.png
index 504132cadbb6..6adb60668edb 100644
Binary files a/platform/icons/src/vcs/stripNull.png and b/platform/icons/src/vcs/stripNull.png differ
diff --git a/platform/icons/src/vcs/stripNull@2x.png b/platform/icons/src/vcs/stripNull@2x.png
new file mode 100644
index 000000000000..8950fe4300ad
Binary files /dev/null and b/platform/icons/src/vcs/stripNull@2x.png differ
diff --git a/platform/icons/src/vcs/stripNull@2x_dark.png b/platform/icons/src/vcs/stripNull@2x_dark.png
new file mode 100644
index 000000000000..69aee30066d7
Binary files /dev/null and b/platform/icons/src/vcs/stripNull@2x_dark.png differ
diff --git a/platform/icons/src/vcs/stripNull_dark.png b/platform/icons/src/vcs/stripNull_dark.png
new file mode 100644
index 000000000000..959c379459a6
Binary files /dev/null and b/platform/icons/src/vcs/stripNull_dark.png differ
diff --git a/platform/icons/src/vcs/stripUp.png b/platform/icons/src/vcs/stripUp.png
index 5e3c314ef9a9..6c5c812ff161 100644
Binary files a/platform/icons/src/vcs/stripUp.png and b/platform/icons/src/vcs/stripUp.png differ
diff --git a/platform/icons/src/vcs/stripUp@2x.png b/platform/icons/src/vcs/stripUp@2x.png
new file mode 100644
index 000000000000..3c53f44014c7
Binary files /dev/null and b/platform/icons/src/vcs/stripUp@2x.png differ
diff --git a/platform/icons/src/vcs/stripUp@2x_dark.png b/platform/icons/src/vcs/stripUp@2x_dark.png
new file mode 100644
index 000000000000..a7bbd397df95
Binary files /dev/null and b/platform/icons/src/vcs/stripUp@2x_dark.png differ
diff --git a/platform/icons/src/vcs/stripUp_dark.png b/platform/icons/src/vcs/stripUp_dark.png
new file mode 100644
index 000000000000..129a96a3ea7c
Binary files /dev/null and b/platform/icons/src/vcs/stripUp_dark.png differ
diff --git a/platform/lang-api/src/com/intellij/execution/ExecutionManager.java b/platform/lang-api/src/com/intellij/execution/ExecutionManager.java
index 3c2c875f4fed..1979a7d123b3 100644
--- a/platform/lang-api/src/com/intellij/execution/ExecutionManager.java
+++ b/platform/lang-api/src/com/intellij/execution/ExecutionManager.java
@@ -52,13 +52,13 @@ public abstract class ExecutionManager {
   public abstract void restartRunProfile(@NotNull Project project,
                                          @NotNull Executor executor,
                                          @NotNull ExecutionTarget target,
-                                         @NotNull RunnerAndConfigurationSettings configuration,
+                                         @Nullable RunnerAndConfigurationSettings configuration,
                                          @Nullable ProcessHandler processHandler);
 
   //currentDescriptor is null for toolbar/popup action and not null for actions in run/debug toolwindows
   public abstract void restartRunProfile(@NotNull Project project,
                                          @NotNull Executor executor,
                                          @NotNull ExecutionTarget target,
-                                         @NotNull RunnerAndConfigurationSettings configuration,
+                                         @Nullable RunnerAndConfigurationSettings configuration,
                                          @Nullable RunContentDescriptor currentDescriptor);
 }
diff --git a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java
index 378f4063d8fb..6f1017af470b 100644
--- a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java
+++ b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironmentBuilder.java
@@ -96,6 +96,7 @@ public final class ExecutionEnvironmentBuilder {
     return this;
   }
 
+  @NotNull
   public ExecutionEnvironment build() {
     ExecutionEnvironment environment =
       new ExecutionEnvironment(myRunProfile, myTarget, myProject, myRunnerSettings, myConfigurationSettings, myContentToReuse,
diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java
index 408c51870736..1a9026daf136 100644
--- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java
+++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java
@@ -30,6 +30,7 @@ public abstract class ProjectTemplateParameterFactory {
   // standard ids
   public static final String IJ_BASE_PACKAGE = "IJ_BASE_PACKAGE";
   public static final String IJ_PROJECT_NAME = "IJ_PROJECT_NAME";
+  public static final String IJ_APPLICATION_SERVER = "IJ_APPLICATION_SERVER";
 
   public abstract String getParameterId();
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
index 1901ca31e02e..e88506016808 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
@@ -43,12 +43,6 @@ public class CamelHumpMatcher extends PrefixMatcher {
 
   @Override
   public boolean isStartMatch(LookupElement element) {
-    if (super.isStartMatch(element)) {
-      return true;
-    }
-    if (element.isCaseSensitive()) {
-      return false;
-    }
     return ContainerUtil.or(element.getAllLookupStrings(), new Condition<String>() {
       @Override
       public boolean value(String s) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java
index db00b690b06a..3e12b980eae1 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByLineCommentHandler.java
@@ -36,6 +36,7 @@ import com.intellij.openapi.fileTypes.impl.CustomSyntaxTableFileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
@@ -46,7 +47,6 @@ import com.intellij.psi.codeStyle.Indent;
 import com.intellij.psi.util.PsiUtilBase;
 import com.intellij.util.DocumentUtil;
 import com.intellij.util.StringBuilderSpinAllocator;
-import com.intellij.util.SystemProperties;
 import com.intellij.util.containers.IntArrayList;
 import com.intellij.util.text.CharArrayUtil;
 import gnu.trove.THashMap;
@@ -57,9 +57,6 @@ import java.util.Map;
 
 public class CommentByLineCommentHandler implements CodeInsightActionHandler {
 
-  private static final int MIN_LINES_TO_COMMENT_TO_USE_BULK_PROCESSING
-    = SystemProperties.getIntProperty("idea.bulk.comment.lines.trigger", 100);
-
   private Project                                         myProject;
   private PsiFile                                         myFile;
   private Document                                        myDocument;
@@ -424,7 +421,8 @@ public class CommentByLineCommentHandler implements CodeInsightActionHandler {
   }
 
   public void doDefaultCommenting(final Commenter commenter) {
-    DocumentUtil.executeInBulk(myDocument, myEndLine - myStartLine >= MIN_LINES_TO_COMMENT_TO_USE_BULK_PROCESSING, new Runnable() {
+    DocumentUtil.executeInBulk(
+      myDocument, myEndLine - myStartLine >= Registry.intValue("comment.by.line.bulk.lines.trigger"), new Runnable() {
       @Override
       public void run() {
         for (int line = myEndLine; line >= myStartLine; line--) {
@@ -440,7 +438,8 @@ public class CommentByLineCommentHandler implements CodeInsightActionHandler {
     final FileType fileType = myFile.getFileType();
     final Indent minIndent = computeMinIndent(myStartLine, myEndLine, chars, myCodeStyleManager, fileType);
 
-    DocumentUtil.executeInBulk(myDocument, myEndLine - myStartLine > MIN_LINES_TO_COMMENT_TO_USE_BULK_PROCESSING, new Runnable() {
+    DocumentUtil.executeInBulk(
+      myDocument, myEndLine - myStartLine > Registry.intValue("comment.by.line.bulk.lines.trigger"), new Runnable() {
       @Override
       public void run() {
         for (int line = myEndLine; line >= myStartLine; line--) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java
index 715fd486f772..efa6561c24a0 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java
@@ -420,6 +420,7 @@ public class ImplementationViewComponent extends JPanel {
   }
 
 
+  @Nullable
   public static String getNewText(PsiElement elt) {
     Project project = elt.getProject();
     PsiFile psiFile = getContainingFile(elt);
@@ -427,6 +428,10 @@ public class ImplementationViewComponent extends JPanel {
     final Document doc = PsiDocumentManager.getInstance(project).getDocument(psiFile);
     if (doc == null) return null;
 
+    if (elt.getTextRange() == null) {
+      return null;
+    }
+
     final ImplementationTextSelectioner implementationTextSelectioner =
       LanguageImplementationTextSelectioner.INSTANCE.forLanguage(elt.getLanguage());
     int start = implementationTextSelectioner.getTextStartOffset(elt);
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
index a486736b6c4d..a16223f1fd49 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
@@ -274,7 +274,7 @@ public class ParameterInfoController {
 
     if (elementForUpdating != null) {
       myHandler.updateParameterInfo(elementForUpdating, context);
-      if (myHint.isVisible() && myEditor.getComponent().getRootPane() != null) {
+      if (!myDisposed && myHint.isVisible() && myEditor.getComponent().getRootPane() != null) {
         myComponent.update();
         Pair<Point,Short> pos = myProvider.getBestPointPosition(myHint, (PsiElement)elementForUpdating, offset, true, HintManager.UNDER);
         HintManagerImpl.adjustEditorHintPosition(myHint, myEditor, pos.getFirst(), pos.getSecond());
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoTypeDeclarationAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoTypeDeclarationAction.java
index e0d06b82b14f..ba7bc9d08159 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoTypeDeclarationAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoTypeDeclarationAction.java
@@ -84,7 +84,7 @@ public class GotoTypeDeclarationAction extends BaseCodeInsightAction implements
 
   private static void navigate(@NotNull Project project, @NotNull PsiElement symbolType) {
     PsiElement element = symbolType.getNavigationElement();
-    assert element != null;
+    assert element != null : "SymbolType :"+symbolType+"; file: "+symbolType.getContainingFile();
     VirtualFile file = element.getContainingFile().getVirtualFile();
     if (file != null) {
       OpenFileDescriptor descriptor = new OpenFileDescriptor(project, file, element.getTextOffset());
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
index 103560466ea5..b60b58736eb3 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
@@ -261,7 +261,8 @@ public class InspectionProfileImpl extends ProfileEx implements ModifiableModel,
 
     StringInterner interner = new StringInterner();
     for (final Object o : element.getChildren(INSPECTION_TOOL_TAG)) {
-      Element toolElement = (Element)o;
+      // make clone to avoid retaining memory via o.parent pointers
+      Element toolElement = (Element)((Element)o).clone();
       JDOMUtil.internElement(toolElement, interner);
 
       String toolClassName = toolElement.getAttributeValue(CLASS_TAG);
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java
index 333683dcb07a..62873194e340 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java
@@ -261,7 +261,7 @@ public class ExecutionManagerImpl extends ExecutionManager implements ProjectCom
   public void restartRunProfile(@NotNull final Project project,
                                 @NotNull final Executor executor,
                                 @NotNull final ExecutionTarget target,
-                                @NotNull final RunnerAndConfigurationSettings configuration,
+                                @Nullable final RunnerAndConfigurationSettings configuration,
                                 @Nullable final ProcessHandler processHandler) {
     if (processHandler != null) {
       for (RunContentDescriptor descriptor : getContentManager().getAllDescriptors()) {
@@ -279,13 +279,18 @@ public class ExecutionManagerImpl extends ExecutionManager implements ProjectCom
   public void restartRunProfile(@NotNull final Project project,
                                 @NotNull final Executor executor,
                                 @NotNull final ExecutionTarget target,
-                                @NotNull final RunnerAndConfigurationSettings configuration,
+                                @Nullable final RunnerAndConfigurationSettings configuration,
                                 @Nullable final RunContentDescriptor currentDescriptor) {
-    if (ProgramRunnerUtil.getRunner(executor.getId(), configuration) == null) {
+    if (configuration != null && ProgramRunnerUtil.getRunner(executor.getId(), configuration) == null) {
+      LOG.error("Cannot find runner for " + configuration.getName());
+      return;
+    }
+    if (configuration == null && (currentDescriptor == null || currentDescriptor.getRestarter() == null)) {
+      LOG.error("Nothing to restart");
       return;
     }
     final List<RunContentDescriptor> descriptorsToStop = new ArrayList<RunContentDescriptor>();
-    if (configuration.isSingleton()) {
+    if (configuration != null && configuration.isSingleton()) {
       descriptorsToStop.addAll(getRunningDescriptors(configuration));
     }
     else if (currentDescriptor != null) {
@@ -293,7 +298,7 @@ public class ExecutionManagerImpl extends ExecutionManager implements ProjectCom
     }
 
     if (!descriptorsToStop.isEmpty()) {
-      if ((descriptorsToStop.size() > 1 || currentDescriptor == null || descriptorsToStop.get(0) != currentDescriptor) &&
+      if (configuration != null && (descriptorsToStop.size() > 1 || currentDescriptor == null || descriptorsToStop.get(0) != currentDescriptor) &&
           !userApprovesStop(project, configuration.getName(), descriptorsToStop.size())) {
         return;
       }
@@ -302,7 +307,7 @@ public class ExecutionManagerImpl extends ExecutionManager implements ProjectCom
       }
     }
     else {
-      ProgramRunnerUtil.executeConfiguration(project, configuration, executor, target, currentDescriptor, true);
+      start(project, configuration, executor, target, currentDescriptor);
       return;
     }
 
@@ -316,12 +321,26 @@ public class ExecutionManagerImpl extends ExecutionManager implements ProjectCom
             return;
           }
         }
-        ProgramRunnerUtil.executeConfiguration(project, configuration, executor, target, currentDescriptor, true);
+        start(project, configuration, executor, target, currentDescriptor);
       }
     };
     awaitingTerminationAlarm.addRequest(runnable, 100);
   }
 
+  private static void start(@NotNull Project project,
+                            @Nullable RunnerAndConfigurationSettings configuration,
+                            @NotNull Executor executor,
+                            @NotNull ExecutionTarget target,
+                            @Nullable RunContentDescriptor descriptor) {
+    Runnable restarter = descriptor != null ? descriptor.getRestarter() : null;
+    if (configuration != null) {
+      ProgramRunnerUtil.executeConfiguration(project, configuration, executor, target, descriptor, true);
+    }
+    else if (restarter != null) {
+      restarter.run();
+    }
+  }
+
   private static boolean userApprovesStop(Project project, String configName, int instancesCount) {
     RunManagerImpl runManager = RunManagerImpl.getInstanceImpl(project);
     final RunManagerConfig config = runManager.getConfig();
@@ -376,7 +395,7 @@ public class ExecutionManagerImpl extends ExecutionManager implements ProjectCom
   }
 
 
-  private void stop(RunContentDescriptor runContentDescriptor) {
+  private static void stop(RunContentDescriptor runContentDescriptor) {
     ProcessHandler processHandler = runContentDescriptor != null ? runContentDescriptor.getProcessHandler() : null;
     if (processHandler == null) {
       return;
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
index 58ae0b7e4d9a..876a4303f50c 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
@@ -19,6 +19,7 @@ package com.intellij.execution.impl;
 import com.intellij.execution.*;
 import com.intellij.execution.configurations.*;
 import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.ide.util.projectWizard.ProjectTemplateComponent;
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
@@ -39,7 +40,7 @@ import javax.swing.*;
 import java.util.*;
 
 
-public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, ProjectComponent {
+public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, ProjectComponent, ProjectTemplateComponent {
   private final Project myProject;
 
   private final Map<String, ConfigurationType> myTypesByName = new LinkedHashMap<String, ConfigurationType>();
@@ -1140,4 +1141,9 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable,
       myProviderKeysMap.put(id.toString(), id);
     }
   }
+
+  @Override
+  public String getStorageFile() {
+    return "workspace.xml";
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java b/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java
index a0605c6b8e21..03e302bbf4d0 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java
@@ -108,31 +108,24 @@ public class RestartAction extends FakeRerunAction implements DumbAware, AnActio
 
   public void actionPerformed(final AnActionEvent e) {
     Project project = myEnvironment.getProject();
-    RunnerAndConfigurationSettings settings = myEnvironment.getRunnerAndConfigurationSettings();
     if (project == null)
       return;
-    if (settings != null) {
       if (myProcessHandler != null) {
         ExecutionManager.getInstance(project).restartRunProfile(project,
                                                                 myExecutor,
                                                                 myEnvironment.getExecutionTarget(),
-                                                                settings,
+                                                                myEnvironment.getRunnerAndConfigurationSettings(),
                                                                 myProcessHandler);
       }
       else {
         ExecutionManager.getInstance(project).restartRunProfile(project,
                                                                 myExecutor,
                                                                 myEnvironment.getExecutionTarget(),
-                                                                settings,
+                                                                myEnvironment.getRunnerAndConfigurationSettings(),
                                                                 myDescriptor);
       }
-    }
-    else {
-      restart();
-    }
   }
 
-  //Should be used by android framework only
   public void restart() {
     final Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext(myDescriptor.getComponent()));
     if (ExecutorRegistry.getInstance().isStarting(project, myExecutor.getId(), myRunner.getRunnerId())) {
diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
index 84b29b056686..6c5cf7f9f8d0 100644
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
@@ -588,19 +588,20 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider, Dock
     window.setTitleActions(collapseAction);
 
     final DefaultActionGroup group = new DefaultActionGroup();
-    if (!PlatformUtils.isAppCode()) {
-      group.add(new FavoritesShowMembersAction(myProject, myBuilder));
-    }
-
     final ProjectViewDirectoryHelper helper = ProjectViewDirectoryHelper.getInstance(myProject);
 
     if (helper.supportsFlattenPackages()) {
       group.add(new FavoritesFlattenPackagesAction(myProject, myBuilder));
     }
-
     if (helper.supportsHideEmptyMiddlePackages()) {
       group.add(new FavoritesCompactEmptyMiddlePackagesAction(myProject, myBuilder));
     }
+    if (helper.supportsFlattenPackages()) {
+      group.addAction(new FavoritesAbbreviatePackageNamesAction(myProject, myBuilder));
+    }
+    if (!PlatformUtils.isAppCode()) {
+      group.add(new FavoritesShowMembersAction(myProject, myBuilder));
+    }
 
     final FavoritesAutoscrollFromSourceHandler handler = new FavoritesAutoscrollFromSourceHandler(myProject, myBuilder);
     handler.install();
diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewSettings.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewSettings.java
index 915d59df0440..4870d4e605b2 100644
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewSettings.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewSettings.java
@@ -39,6 +39,9 @@ public class FavoritesViewSettings implements ViewSettings {
   @PropertyName("favorites.view.settings.hide.empty.middle.packages")
   public boolean myHideEmptyMiddlePackages = true;
 
+  @PropertyName("favorites.view.settings.abbreviate.qualified.package.names")
+  public boolean myAbbreviateQualifiedPackages = false;
+
 
   public FavoritesViewSettings() {
     PropertiesComponent.getInstance().loadFields(this);
@@ -89,7 +92,7 @@ public class FavoritesViewSettings implements ViewSettings {
 
   @Override
   public boolean isAbbreviatePackageNames() {
-    return false;
+    return myAbbreviateQualifiedPackages;
   }
 
   @Override
@@ -115,4 +118,9 @@ public class FavoritesViewSettings implements ViewSettings {
     myHideEmptyMiddlePackages = hide;
     save();
   }
+
+  public void setAbbreviateQualifiedPackages(boolean abbreviate) {
+    myAbbreviateQualifiedPackages = abbreviate;
+    save();
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesAbbreviatePackageNamesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesAbbreviatePackageNamesAction.java
new file mode 100644
index 000000000000..ea686dd178ab
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesAbbreviatePackageNamesAction.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ide.favoritesTreeView.actions;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.ide.IdeBundle;
+import com.intellij.ide.favoritesTreeView.FavoritesViewTreeBuilder;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.project.Project;
+
+/**
+ * User: Vassiliy.Kudryashov
+ */
+public class FavoritesAbbreviatePackageNamesAction extends FavoritesToolbarButtonAction {
+  public FavoritesAbbreviatePackageNamesAction(Project project, FavoritesViewTreeBuilder builder) {
+    super(project, builder, IdeBundle.message("action.abbreviate.qualified.package.names"), AllIcons.ObjectBrowser.AbbreviatePackageNames);
+  }
+
+  @Override
+  public boolean isOptionEnabled() {
+    return getViewSettings().isAbbreviatePackageNames();
+  }
+
+  @Override
+  public void setOption(boolean enabled) {
+    getViewSettings().setAbbreviateQualifiedPackages(enabled);
+  }
+
+  @Override
+  public void updateButton(AnActionEvent e) {
+    super.updateButton(e);
+    setVisible(getViewSettings().isFlattenPackages());
+  }
+}
diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java
index 38e73a631048..9781ff8d4249 100644
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java
@@ -18,12 +18,35 @@ package com.intellij.ide.favoritesTreeView.actions;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.favoritesTreeView.FavoritesViewTreeBuilder;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.project.Project;
 
 /**
  * @author Konstantin Bulenkov
  */
 public class FavoritesCompactEmptyMiddlePackagesAction extends FavoritesToolbarButtonAction {
+  public FavoritesCompactEmptyMiddlePackagesAction(Project project, FavoritesViewTreeBuilder builder) {
+    super(project, builder,
+          IdeBundle.message("action.compact.empty.middle.packages"),
+          AllIcons.ObjectBrowser.CompactEmptyPackages);
+  }
+
+  @Override
+  public void updateButton(AnActionEvent e) {
+    super.updateButton(e);
+    Presentation presentation = e.getPresentation();
+    if (getViewSettings().isFlattenPackages()) {
+      presentation.setText(IdeBundle.message("action.hide.empty.middle.packages"));
+      presentation.setDescription(IdeBundle.message("action.show.hide.empty.middle.packages"));
+    }
+    else {
+      presentation.setText(IdeBundle.message("action.compact.empty.middle.packages"));
+      presentation.setDescription(IdeBundle.message("action.show.compact.empty.middle.packages"));
+    }
+
+  }
+
   @Override
   public boolean isOptionEnabled() {
     return getViewSettings().isHideEmptyMiddlePackages();
@@ -33,10 +56,4 @@ public class FavoritesCompactEmptyMiddlePackagesAction extends FavoritesToolbarB
   public void setOption(boolean hide) {
     getViewSettings().setHideEmptyMiddlePackages(hide);
   }
-
-  public FavoritesCompactEmptyMiddlePackagesAction(Project project, FavoritesViewTreeBuilder builder) {
-    super(project, builder,
-          IdeBundle.message("action.compact.empty.middle.packages"),
-          AllIcons.ObjectBrowser.CompactEmptyPackages);
-  }
 }
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
index edb2bb87bf70..7a4a7a01e852 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
@@ -139,7 +139,7 @@ public class DirectoryIndexImpl extends DirectoryIndex {
     }
   }
 
-  protected void dispatchPendingEvents() {
+  private void dispatchPendingEvents() {
     myConnection.deliverImmediately();
   }
 
@@ -414,7 +414,7 @@ public class DirectoryIndexImpl extends DirectoryIndex {
     return myInitialized;
   }
 
-  protected void doInitialize() {
+  private void doInitialize() {
     IndexState newState = new IndexState();
     newState.doInitialize(false);
     myState = newState;
@@ -428,7 +428,7 @@ public class DirectoryIndexImpl extends DirectoryIndex {
   }
 
   @NotNull
-  protected static ContentEntry[] getContentEntries(@NotNull Module module) {
+  private static ContentEntry[] getContentEntries(@NotNull Module module) {
     return ModuleRootManager.getInstance(module).getContentEntries();
   }
 
@@ -478,12 +478,12 @@ public class DirectoryIndexImpl extends DirectoryIndex {
   }
 
   @Nullable
-  protected static String getPackageNameForSubdir(String parentPackageName, String subdirName) {
+  private static String getPackageNameForSubdir(String parentPackageName, String subdirName) {
     if (parentPackageName == null) return null;
     return parentPackageName.isEmpty() ? subdirName : parentPackageName + "." + subdirName;
   }
 
-  class IndexState {
+  private class IndexState {
     private final TIntObjectHashMap<Set<String>> myExcludeRootsMap = new TIntObjectHashMap<Set<String>>();
     private final TIntHashSet myProjectExcludeRoots = new TIntHashSet();
     private final TIntObjectHashMap<DirectoryInfo> myDirToInfoMap = new TIntObjectHashMap<DirectoryInfo>();
@@ -551,11 +551,10 @@ public class DirectoryIndexImpl extends DirectoryIndex {
     }
 
     @Nullable
-    DirectoryInfo getInfo(int fileId) {
+    private DirectoryInfo getInfo(int fileId) {
       return myDirToInfoMap.get(fileId);
     }
 
-
     private void storeInfo(@NotNull DirectoryInfo info, int id) {
       if (CHECK) {
         VirtualFile file = findFileById(id);
@@ -567,7 +566,7 @@ public class DirectoryIndexImpl extends DirectoryIndex {
       myDirToInfoMap.put(id, info);
     }
 
-    void assertAncestorsConsistent() {
+    private void assertAncestorsConsistent() {
       if (CHECK) {
         myDirToInfoMap.forEachEntry(new TIntObjectProcedure<DirectoryInfo>() {
           @Override
@@ -594,10 +593,10 @@ public class DirectoryIndexImpl extends DirectoryIndex {
       }
     }
 
-    void fillMapWithModuleContent(@NotNull NewVirtualFile root,
-                                  final Module module,
-                                  final NewVirtualFile contentRoot,
-                                  @Nullable final ProgressIndicator progress) {
+    private void fillMapWithModuleContent(@NotNull NewVirtualFile root,
+                                          final Module module,
+                                          final NewVirtualFile contentRoot,
+                                          @Nullable final ProgressIndicator progress) {
       final int contentRootId = contentRoot == null ? 0 : contentRoot.getId();
       if (contentRoot != null) {
         assert VfsUtilCore.isAncestor(contentRoot, root, false) : "Root: "+root+"; contentRoot: "+contentRoot;
@@ -725,13 +724,13 @@ public class DirectoryIndexImpl extends DirectoryIndex {
       }
     }
 
-    protected void fillMapWithModuleSource(@NotNull final Module module,
-                                           @NotNull final NewVirtualFile contentRoot,
-                                           @NotNull final NewVirtualFile dir,
-                                           @NotNull final String packageName,
-                                           @NotNull final NewVirtualFile sourceRoot,
-                                           final boolean isTestSource,
-                                           @Nullable final ProgressIndicator progress) {
+    private void fillMapWithModuleSource(@NotNull final Module module,
+                                         @NotNull final NewVirtualFile contentRoot,
+                                         @NotNull final NewVirtualFile dir,
+                                         @NotNull final String packageName,
+                                         @NotNull final NewVirtualFile sourceRoot,
+                                         final boolean isTestSource,
+                                         @Nullable final ProgressIndicator progress) {
       assert VfsUtilCore.isAncestor(sourceRoot, dir, false) : "SourceRoot: "+sourceRoot+" ("+sourceRoot.getFileSystem()+"); dir: "+dir+" ("+dir.getFileSystem()+")";
       VfsUtilCore.visitChildrenRecursively(dir, new DirectoryVisitor() {
         private final Stack<String> myPackages = new Stack<String>();
@@ -945,7 +944,7 @@ public class DirectoryIndexImpl extends DirectoryIndex {
       }
     }
 
-    protected void setPackageName(int dirId, @Nullable String newPackageName) {
+    private void setPackageName(int dirId, @Nullable String newPackageName) {
       String oldPackageName = myDirToPackageName.get(dirId);
       if (oldPackageName != null) {
         removeDirFromPackage(oldPackageName, dirId);
@@ -962,13 +961,13 @@ public class DirectoryIndexImpl extends DirectoryIndex {
     }
 
     // orderEntries must be sorted BY_OWNER_MODULE
-    protected void fillMapWithOrderEntries(@NotNull NewVirtualFile root,
-                                           @NotNull final OrderEntry[] orderEntries,
-                                           @Nullable final Module module,
-                                           @Nullable final NewVirtualFile libraryClassRoot,
-                                           @Nullable final NewVirtualFile librarySourceRoot,
-                                           @Nullable final DirectoryInfo parentInfo,
-                                           @Nullable final ProgressIndicator progress) {
+    private void fillMapWithOrderEntries(@NotNull NewVirtualFile root,
+                                         @NotNull final OrderEntry[] orderEntries,
+                                         @Nullable final Module module,
+                                         @Nullable final NewVirtualFile libraryClassRoot,
+                                         @Nullable final NewVirtualFile librarySourceRoot,
+                                         @Nullable final DirectoryInfo parentInfo,
+                                         @Nullable final ProgressIndicator progress) {
       VfsUtilCore.visitChildrenRecursively(root, new DirectoryVisitor() {
         private final Stack<OrderEntry[]> myEntries = new Stack<OrderEntry[]>();
 
@@ -1014,7 +1013,7 @@ public class DirectoryIndexImpl extends DirectoryIndex {
       });
     }
 
-    protected void doInitialize(boolean reverseAllSets/* for testing order independence*/) {
+    private void doInitialize(boolean reverseAllSets/* for testing order independence*/) {
       assertAncestorsConsistent();
       ProgressIndicator progress = ProgressIndicatorProvider.getGlobalProgressIndicator();
       if (progress == null) progress = new EmptyProgressIndicator();
@@ -1148,7 +1147,7 @@ public class DirectoryIndexImpl extends DirectoryIndex {
     }
 
     @NotNull
-    IndexState copy(@Nullable final TIntProcedure idFilter) {
+    private IndexState copy(@Nullable final TIntProcedure idFilter) {
       final IndexState copy = new IndexState();
 
       myExcludeRootsMap.forEachEntry(new TIntObjectProcedure<Set<String>>() {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java
index 475c16c2f326..4a1591dbac98 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java
@@ -1,6 +1,9 @@
 package com.intellij.refactoring.move.moveClassesOrPackages;
 
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.ProperTextRange;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.refactoring.util.MoveRenameUsageInfo;
@@ -8,9 +11,7 @@ import com.intellij.refactoring.util.NonCodeUsageInfo;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.IncorrectOperationException;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class CommonMoveUtil {
 
@@ -21,6 +22,24 @@ public class CommonMoveUtil {
 
   public static NonCodeUsageInfo[] retargetUsages(final UsageInfo[] usages, final Map<PsiElement, PsiElement> oldToNewElementsMapping)
     throws IncorrectOperationException {
+    Arrays.sort(usages, new Comparator<UsageInfo>() {
+      @Override
+      public int compare(UsageInfo o1, UsageInfo o2) {
+        final VirtualFile file1 = o1.getVirtualFile();
+        final VirtualFile file2 = o2.getVirtualFile();
+        if (Comparing.equal(file1, file2)) {
+          final ProperTextRange rangeInElement1 = o1.getRangeInElement();
+          final ProperTextRange rangeInElement2 = o2.getRangeInElement();
+          if (rangeInElement1 != null && rangeInElement2 != null) {
+            return rangeInElement2.getStartOffset() - rangeInElement1.getStartOffset();
+          }
+          return 0;
+        }
+        if (file1 == null) return -1;
+        if (file2 == null) return 1;
+        return Comparing.compare(file1.getPath(), file2.getPath());
+      }
+    });
     List<NonCodeUsageInfo> nonCodeUsages = new ArrayList<NonCodeUsageInfo>();
     for (UsageInfo usage : usages) {
       if (usage instanceof NonCodeUsageInfo) {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenamePsiElementProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenamePsiElementProcessor.java
index 3a095feff05a..736f482259da 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenamePsiElementProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenamePsiElementProcessor.java
@@ -59,6 +59,11 @@ public abstract class RenamePsiElementProcessor {
     RenameUtil.doRenameGenericNamedElement(element, newName, usages, listener);
   }
 
+  @NotNull
+  public Collection<PsiReference> findReferences(final PsiElement element, boolean searchInCommentsAndStrings) {
+    return findReferences(element);
+  }
+
   @NotNull
   public Collection<PsiReference> findReferences(final PsiElement element) {
     return ReferencesSearch.search(element).findAll();
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
index c810f88cc359..05acdf4257d2 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
@@ -68,7 +68,7 @@ public class RenameUtil {
     GlobalSearchScope projectScope = GlobalSearchScope.projectScope(manager.getProject());
     RenamePsiElementProcessor processor = RenamePsiElementProcessor.forElement(element);
 
-    Collection<PsiReference> refs = processor.findReferences(element);
+    Collection<PsiReference> refs = processor.findReferences(element, searchInStringsAndComments);
     for (final PsiReference ref : refs) {
       if (ref == null) {
         LOG.error("null reference from processor " + processor);
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/RenameChooser.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/RenameChooser.java
index dce7f6da2baa..36aa8673efa1 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/RenameChooser.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/RenameChooser.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.refactoring.rename.inplace;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.colors.EditorColors;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
@@ -26,6 +27,7 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
+import com.intellij.refactoring.RefactoringSettings;
 import com.intellij.ui.components.JBList;
 import org.jetbrains.annotations.NonNls;
 
@@ -54,6 +56,11 @@ abstract class RenameChooser {
   
   public void showChooser(final Collection<PsiReference> refs,
                           final Collection<Pair<PsiElement, TextRange>> stringUsages) {
+    if (ApplicationManager.getApplication().isUnitTestMode()) {
+      runRenameTemplate(
+        RefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_FILE ? stringUsages : new ArrayList<Pair<PsiElement, TextRange>>());
+      return;
+    }
 
     final DefaultListModel model = new DefaultListModel();
     model.addElement(CODE_OCCURRENCES);
diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java b/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java
index a790520b165a..e4100a58f23e 100644
--- a/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java
+++ b/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java
@@ -499,18 +499,18 @@ public class VfsUtil extends VfsUtilCore {
         return prefix + ":///" + suffix;
       }
     }
-    else if (SystemInfoRt.isWindows && url.regionMatches(0, LocalFileSystem.PROTOCOL_PREFIX, 0, LocalFileSystem.PROTOCOL_PREFIX.length())) {
+    else if (url.charAt(index + 3) == '/' && SystemInfoRt.isWindows && url.regionMatches(0, LocalFileSystem.PROTOCOL_PREFIX, 0, LocalFileSystem.PROTOCOL_PREFIX.length())) {
       // file:///C:/test/file.js -> file://C:/test/file.js
-      for (int i = index + 3; i < url.length(); i++) {
+      for (int i = index + 4; i < url.length(); i++) {
         char c = url.charAt(i);
         if (c == '/') {
-          return url;
-        }
-        else if (c == ':') {
           break;
         }
+        else if (c == ':') {
+          return LocalFileSystem.PROTOCOL_PREFIX + url.substring(index + 4);
+        }
       }
-      return LocalFileSystem.PROTOCOL_PREFIX + url.substring(index + 3);
+      return url;
     }
     return url;
   }
diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/RefreshQueue.java b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/RefreshQueue.java
index 4e1a9d40afbc..0f7fe1f1f941 100644
--- a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/RefreshQueue.java
+++ b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/RefreshQueue.java
@@ -38,7 +38,7 @@ public abstract class RefreshQueue {
 
   public abstract RefreshSession createSession(boolean async, boolean recursive, @Nullable Runnable finishRunnable, @NotNull ModalityState state);
 
-  public final void refresh(boolean async, boolean recursive, @Nullable Runnable finishRunnable, VirtualFile... files) {
+  public final void refresh(boolean async, boolean recursive, @Nullable Runnable finishRunnable, @NotNull VirtualFile... files) {
     refresh(async, recursive, finishRunnable, getDefaultModalityState(), files);
   }
 
@@ -50,7 +50,7 @@ public abstract class RefreshQueue {
                             boolean recursive,
                             @Nullable Runnable finishRunnable,
                             @NotNull ModalityState state,
-                            VirtualFile... files) {
+                            @NotNull VirtualFile... files) {
     RefreshSession session = createSession(async, recursive, finishRunnable, state);
     session.addAllFiles(files);
     session.launch();
diff --git a/platform/platform-api/src/com/intellij/ui/CollectionComboBoxModel.java b/platform/platform-api/src/com/intellij/ui/CollectionComboBoxModel.java
index 162bb82a1e42..51703470e7cf 100644
--- a/platform/platform-api/src/com/intellij/ui/CollectionComboBoxModel.java
+++ b/platform/platform-api/src/com/intellij/ui/CollectionComboBoxModel.java
@@ -32,6 +32,10 @@ public class CollectionComboBoxModel extends AbstractCollectionComboBoxModel {
     myItems = Collections.unmodifiableList(items);
   }
 
+  public CollectionComboBoxModel(List items) {
+    super(items.isEmpty() ? null : items.get(0));
+    myItems = items;
+  }
 
   @NotNull
   final protected List getItems() {
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowLogAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowLogAction.java
index d68063ead8aa..33eae3e47f7a 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowLogAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowLogAction.java
@@ -20,7 +20,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.util.SystemInfo;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
@@ -44,6 +43,6 @@ public class ShowLogAction extends AnAction implements DumbAware {
 
   @NotNull
   public static String getActionName() {
-    return SystemInfo.isMac ? "Reveal Log in Finder" : "Show Log in " + ShowFilePathAction.getFileManagerName();
+    return "Show Log in " + ShowFilePathAction.getFileManagerName();
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaDarkMetalTheme.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaMetalTheme.java
similarity index 71%
rename from platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaDarkMetalTheme.java
rename to platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaMetalTheme.java
index e891f4e91f76..25937fa14835 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/IdeaDarkMetalTheme.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/DarculaMetalTheme.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
  */
 package com.intellij.ide.ui.laf;
 
-import com.intellij.ui.UIBundle;
-
+import javax.swing.*;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.metal.DefaultMetalTheme;
 import java.awt.*;
@@ -25,27 +24,46 @@ import java.awt.*;
 /**
  * @author Konstantin Bulenkov
  */
-public class IdeaDarkMetalTheme extends DefaultMetalTheme {
-  public String getName() {
-    return UIBundle.message("idea.blue.metal.theme.name");
-  }
+public class DarculaMetalTheme extends DefaultMetalTheme {
 
-  private static final ColorUIResource darkGray = new ColorUIResource(132, 130, 132);
+  private final ColorUIResource myControlHighlightColor = new ColorUIResource(108, 111, 113);
+  private final ColorUIResource myControlDarkShadowColor = new ColorUIResource(39, 42, 44);
+  private final ColorUIResource myControlColor = new ColorUIResource(UIManager.getColor("control"));
   private static final ColorUIResource white = new ColorUIResource(255, 255, 255);
   private static final ColorUIResource darkBlue = new ColorUIResource(82, 108, 164);
-  //  private static ColorUIResource lightGray = new ColorUIResource(214, 211, 206);
   private static final ColorUIResource lightGray = new ColorUIResource(214, 214, 214);
+  private final ColorUIResource mySeparatorForeground = new ColorUIResource(53, 56, 58);
+
+  public static final ColorUIResource primary1 = new ColorUIResource(53, 56, 58);
+  private static final ColorUIResource primary2 = new ColorUIResource(91, 135, 206);
+  private static final ColorUIResource primary3 = new ColorUIResource(166, 202, 240);
+
+
+
+  public String getName() {
+    return "Darcula theme";
+  }
 
   public ColorUIResource getControl() {
-    return lightGray;
+    return myControlColor;
+  }
+
+  @Override
+  public ColorUIResource getControlHighlight() {
+    return myControlHighlightColor;
+  }
+
+  @Override
+  public ColorUIResource getControlDarkShadow() {
+    return myControlDarkShadowColor;
   }
 
   public ColorUIResource getSeparatorBackground() {
-    return white;
+    return getControl();
   }
 
   public ColorUIResource getSeparatorForeground() {
-    return darkGray;
+    return mySeparatorForeground;
   }
 
   public ColorUIResource getMenuBackground() {
@@ -64,10 +82,6 @@ public class IdeaDarkMetalTheme extends DefaultMetalTheme {
     return white;
   }
 
-  public static final ColorUIResource primary1 = new ColorUIResource(10, 36, 106);
-  private static final ColorUIResource primary2 = new ColorUIResource(91, 135, 206);
-  private static final ColorUIResource primary3 = new ColorUIResource(166, 202, 240);
-
   public ColorUIResource getFocusColor() {
     return new ColorUIResource(Color.black);
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
index c3d7661d9e42..0a7752d3383a 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -344,7 +344,6 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
     }
     else if (DarculaLookAndFeelInfo.CLASS_NAME.equals(lookAndFeelInfo.getClassName())) {
       DarculaLaf laf = new DarculaLaf();
-      MetalLookAndFeel.setCurrentTheme(new IdeaDarkMetalTheme());
       try {
         UIManager.setLookAndFeel(laf);
       }
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java
index e3efb78edfe5..fabcfaae1416 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaLaf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.intellij.ide.ui.laf.darcula;
 
+import com.intellij.ide.ui.laf.DarculaMetalTheme;
 import com.intellij.ide.ui.laf.IdeaLaf;
 import com.intellij.ide.ui.laf.LafManagerImpl;
 import com.intellij.openapi.util.IconLoader;
@@ -91,6 +92,7 @@ public final class DarculaLaf extends BasicLookAndFeel {
       patchComboBox(metalDefaults, defaults);
       defaults.remove("Spinner.arrowButtonBorder");
       defaults.put("Spinner.arrowButtonSize", new Dimension(16, 5));
+      MetalLookAndFeel.setCurrentTheme(new DarculaMetalTheme());
       return defaults;
     }
     catch (Exception ignore) {
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
index c558d085f8b9..91eeaafa552e 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
@@ -89,6 +89,8 @@ Spinner.background=3c3f41
 Spinner.arrowButtonInsets=1,1,1,1
 Spinner.editorBorderPainted=false
 
+SplitPane.highlight=3c3f41
+
 Hyperlink.linkColor=589df6
 
 Tree.collapsedIcon=AllIcons.Mac.Tree_white_right_arrow
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java
index 14dca00e485d..a21d7e2cb349 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java
@@ -405,6 +405,11 @@ public abstract class EditorComposite implements Disposable {
   }
 
   public void dispose() {
+    for (FileEditor editor : myEditors) {
+      if (!Disposer.isDisposed(editor)) {
+        Disposer.dispose(editor);
+      }
+    }
   }
 
   private static class TopBottomPanel extends JPanel {
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java
index f33b29e377d1..cb82d467761b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java
@@ -38,6 +38,7 @@ import com.intellij.openapi.wm.ex.WindowManagerEx;
 import com.intellij.openapi.wm.impl.FrameTitleBuilder;
 import com.intellij.openapi.wm.impl.IdeFrameImpl;
 import com.intellij.ui.Gray;
+import com.intellij.ui.JBColor;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.components.JBPanel;
 import com.intellij.ui.docking.DockManager;
@@ -159,11 +160,11 @@ public class EditorsSplitters extends JBPanel {
     
     if (showEmptyText()) {
       UIUtil.applyRenderingHints(g);
-      g.setColor(UIUtil.isUnderDarcula() ? Gray._200 : Gray._100);
+      g.setColor(new JBColor(Gray._100, Gray._160));
       g.setFont(UIUtil.getLabelFont().deriveFont(UIUtil.isUnderDarcula() ? 24f : 18f));
 
       final UIUtil.TextPainter painter = new UIUtil.TextPainter().withShadow(true).withLineSpacing(1.4f);
-      painter.appendLine("No files are open").underlined(UIUtil.isUnderDarcula()? Gray._200 : Gray._150);
+      painter.appendLine("No files are open").underlined(new JBColor(Gray._150, Gray._100));
 
       if (!isProjectViewVisible()) {
         painter.appendLine("Open Project View with " + KeymapUtil.getShortcutText(new KeyboardShortcut(
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
index 5017b9e4b2a3..ed39011cc635 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
@@ -719,6 +719,12 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec
       providers = newSelectedComposite.getProviders();
     }
     else {
+      if (UISettings.getInstance().EDITOR_TAB_PLACEMENT == UISettings.TABS_NONE) {
+        for (EditorWithProviderComposite composite : window.getEditors()) {
+          Disposer.dispose(composite);
+        }
+      }
+
       // File is not opened yet. In this case we have to create editors
       // and select the created EditorComposite.
       final FileEditorProviderManager editorProviderManager = FileEditorProviderManager.getInstance();
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32FsCache.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32FsCache.java
index 5612b530f0f6..d135f39c4fb7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32FsCache.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32FsCache.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.openapi.vfs.impl.win32;
 
+import com.intellij.openapi.util.io.FileAttributes;
 import com.intellij.openapi.util.io.win32.FileInfo;
 import com.intellij.openapi.util.io.win32.IdeaWin32;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -34,19 +35,19 @@ import java.util.Map;
  */
 class Win32FsCache {
   private final IdeaWin32 myKernel = IdeaWin32.getInstance();
-  private Reference<Map<String, FileInfo>> myCache;
+  private Reference<Map<String, FileAttributes>> myCache;
 
   void clearCache() {
     myCache = null;
   }
 
   @NotNull
-  private Map<String, FileInfo> getMap() {
-    Reference<Map<String, FileInfo>> cache = myCache;
-    Map<String, FileInfo> map = cache == null ? null : cache.get();
+  private Map<String, FileAttributes> getMap() {
+    Reference<Map<String, FileAttributes>> cache = myCache;
+    Map<String, FileAttributes> map = cache == null ? null : cache.get();
     if (map == null) {
-      map = new THashMap<String, FileInfo>();
-      myCache = new SoftReference<Map<String, FileInfo>>(map);
+      map = new THashMap<String, FileAttributes>();
+      myCache = new SoftReference<Map<String, FileAttributes>>(map);
     }
     return map;
   }
@@ -60,10 +61,10 @@ class Win32FsCache {
 
     if (!path.endsWith("/")) path += "/";
     List<String> names = new ArrayList<String>(fileInfo.length);
-    Map<String, FileInfo> map = getMap();
+    Map<String, FileAttributes> map = getMap();
     for (FileInfo info : fileInfo) {
       String name = info.getName();
-      map.put(path + name, info);
+      map.put(path + name, info.toFileAttributes());
       names.add(name);
     }
 
@@ -71,17 +72,18 @@ class Win32FsCache {
   }
 
   @Nullable
-  FileInfo getInfo(@NotNull VirtualFile file) {
+  FileAttributes getAttributes(@NotNull VirtualFile file) {
     String path = file.getPath();
-    Map<String, FileInfo> map = getMap();
-    FileInfo info = map.get(path);
-    if (info == null) {
-      info = myKernel.getInfo(path);
+    Map<String, FileAttributes> map = getMap();
+    FileAttributes attributes = map.get(path);
+    if (attributes == null) {
+      FileInfo info = myKernel.getInfo(path);
       if (info == null) {
         return null;
       }
-      map.put(path, info);
+      attributes = info.toFileAttributes();
+      map.put(path, attributes);
     }
-    return info;
+    return attributes;
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java
index c8353d5c94d5..3bbba55e0992 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java
@@ -16,7 +16,6 @@
 package com.intellij.openapi.vfs.impl.win32;
 
 import com.intellij.openapi.util.io.FileAttributes;
-import com.intellij.openapi.util.io.win32.FileInfo;
 import com.intellij.openapi.util.io.win32.IdeaWin32;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.impl.local.LocalFileSystemBase;
@@ -60,8 +59,7 @@ public class Win32LocalFileSystem extends LocalFileSystemBase {
 
   @Override
   public FileAttributes getAttributes(@NotNull VirtualFile file) {
-    final FileInfo fileInfo = myFsCache.getInfo(file);
-    return fileInfo != null ? fileInfo.toFileAttributes() : null;
+    return myFsCache.getAttributes(file);
   }
 
   @NotNull
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
index c3755c8f90f3..cfbbe4319639 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +65,8 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
   // stores child files. The array is logically divided into the two parts:
   // left subarray for storing real files, right subarray for storing fake files with "suspicious" names
   // files in each subarray are sorted according to the compareNameTo() comparator
-  private VirtualFileSystemEntry[] myChildren = EMPTY_ARRAY; // guarded by this, either real file or fake file (meaning it's not a real child but suspicious name)
+  // guarded by this, either real file or fake file (meaning it's not a real child but suspicious name)
+  private VirtualFileSystemEntry[] myChildren = EMPTY_ARRAY;
 
   public VirtualDirectoryImpl(@NonNls @NotNull final String name,
                               @Nullable final VirtualDirectoryImpl parent,
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileImpl.java
index f89e53226bd8..a6c063d418a8 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileImpl.java
@@ -36,7 +36,7 @@ import java.util.Collection;
 import java.util.Collections;
 
 public class VirtualFileImpl extends VirtualFileSystemEntry {
-  public VirtualFileImpl(String name, VirtualDirectoryImpl parent, int id, @PersistentFS.Attributes final int attributes) {
+  VirtualFileImpl(String name, VirtualDirectoryImpl parent, int id, @PersistentFS.Attributes final int attributes) {
     super(name, parent, id, attributes);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileSystemEntry.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileSystemEntry.java
index 25e054e9e082..c9d9c7881d50 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileSystemEntry.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileSystemEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,10 @@ public abstract class VirtualFileSystemEntry extends NewVirtualFile {
   private static final int INT_FLAGS_MASK = 0xff00;
 
   private static final String EMPTY = "";
-  @NonNls private static final String[] WELL_KNOWN_SUFFIXES = {"$1.class", "$2.class","Test.java","List.java","tion.java", ".class", ".java", ".html", ".txt", ".xml",".php",".gif",".svn",".css",".js"};
+  @NonNls private static final String[] WELL_KNOWN_SUFFIXES = {
+    "$1.class", "$2.class", "Test.java", "List.java", "tion.java", ".class",
+    ".java", ".html", ".txt", ".xml", ".php", ".gif", ".svn", ".css", ".js"
+  };
   private static final byte[][] WELL_KNOWN_SUFFIXES_BYTES;
   private static final int[] WELL_KNOWN_SUFFIXES_LENGTH;
   private static final int SUFFIX_BITS = 4;
diff --git a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
index 3915251adec7..1caac70409a5 100644
--- a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
+++ b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -272,12 +272,14 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen
   }
 
   private void fireColorChanged(Color color) {
+    if (myExternalListeners == null) return;
     for (ColorPickerListener listener : myExternalListeners) {
       listener.colorChanged(color);
     }
   }
 
   private void fireClosed(@Nullable Color color) {
+    if (myExternalListeners == null) return;
     for (ColorPickerListener listener : myExternalListeners) {
       listener.closed(color);
     }
diff --git a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
index e5da6c269228..4c858db93cd8 100644
--- a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
+++ b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
@@ -373,6 +373,7 @@ public abstract class SpeedSearchBase<Comp extends JComponent> extends SpeedSear
       add(searchLabel, BorderLayout.WEST);
       add(mySearchField, BorderLayout.EAST);
       Object element = findElement(mySearchField.getText());
+      onSearchFieldUpdated(initialString);
       updateSelection(element);
     }
 
@@ -436,7 +437,8 @@ public abstract class SpeedSearchBase<Comp extends JComponent> extends SpeedSear
     }
   }
 
-  protected void onSearchFieldUpdated(String s) {}
+  protected void onSearchFieldUpdated(String pattern) {
+  }
 
   private class SearchField extends JTextField {
     SearchField() {
diff --git a/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java b/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java
index b90952db8ec6..5ed5694d8b9e 100644
--- a/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java
+++ b/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java
@@ -87,9 +87,9 @@ public class TableSpeedSearch extends SpeedSearchBase<JTable> {
   protected String getElementText(Object element) {
     final int index = ((Integer)element).intValue();
     final TableModel model = myComponent.getModel();
-    int row = index / model.getColumnCount();
-    int col = index % model.getColumnCount();
-    final Object value = model.getValueAt(row, col);
+    int row = myComponent.convertRowIndexToModel(index / model.getColumnCount());
+    int col = myComponent.convertColumnIndexToModel(index % model.getColumnCount());
+    Object value = model.getValueAt(row, col);
     return myToStringConvertor.fun(value, new Cell(row, col));
   }
 
diff --git a/platform/platform-resources-en/src/messages/XmlBundle.properties b/platform/platform-resources-en/src/messages/XmlBundle.properties
index 04ed0e5f9dbe..5bb5b5d3f3ba 100644
--- a/platform/platform-resources-en/src/messages/XmlBundle.properties
+++ b/platform/platform-resources-en/src/messages/XmlBundle.properties
@@ -241,10 +241,15 @@ label.text.path.to.profiles.ini=Path to \"profiles.ini\":
 label.text.profile=&Profile:
 button.text.settings=Settings...
 display.name.firefox.settings=Firefox Settings
-zen.coding.title=XML Zen Coding
-zen.coding.enable.label=Enable Zen Coding
+
+zen.coding.title=Emmet (XML Zen Coding)
+emmet.configuration.title=Emmet (Zen Coding)
+emmet.auto.insert.vendor.prefixes=Auto insert css vendor prefixes
+zen.coding.enable.label=Enable Emmet
+emmet.enable.bem.filter=Enable BEM filter by default
 zen.coding.enter.abbreviation.dialog.label=Please enter an abbreviation
 zen.coding.incorrect.abbreviation.error=Incorrect abbreviation
+
 title.cannot.create.html.file=Cannot create HTML file
 new.html.file.action=HTML File
 new.html.file.action.description=Creates new HTML file
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index d42d179cf40a..a85031c0686b 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -271,3 +271,5 @@ diagrams.rendering.no.cache=true
 wolf.the.problem.solver=true
 ui.no.bangs.and.whistles=false
 disable.graph.inference=false
+
+comment.by.line.bulk.lines.trigger=100
\ No newline at end of file
diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
index 6cd517927f37..9aeae4eb1c56 100644
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -74,6 +74,7 @@
                     beanClass="com.intellij.lang.LanguageExtensionPoint">
       <with attribute="implementationClass" implements="com.intellij.lang.HtmlInlineScriptTokenTypesProvider"/>
     </extensionPoint>
+    <extensionPoint name="xml.importOptimizer" interface="com.intellij.lang.ImportOptimizer"/>
   </extensionPoints>
 
   <project-components>
@@ -149,6 +150,12 @@
                         serviceImplementation="com.intellij.application.options.editor.WebEditorOptions"/>
     <exportable serviceInterface="com.intellij.application.options.editor.WebEditorOptions"/>
 
+    <applicationConfigurable provider="com.intellij.application.options.emmet.EmmetConfigurableProvider"/>
+    <applicationService serviceInterface="com.intellij.application.options.emmet.EmmetOptions"
+                        serviceImplementation="com.intellij.application.options.emmet.EmmetOptions"/>
+    <exportable serviceInterface="com.intellij.application.options.emmet.EmmetOptions"/>
+
+
     <applicationService serviceInterface="com.intellij.application.options.editor.XmlFoldingSettings"
                         serviceImplementation="com.intellij.application.options.editor.XmlFoldingSettings"/>
 
@@ -447,6 +454,7 @@
     <renameInputValidator implementation="com.intellij.lang.xml.XmlAttributeValueRenameValidator"/>
 
     <xml.attributeDescriptorsProvider implementation="com.intellij.html.impl.Html5CustomAttributeDescriptorsProvider"/>
+    <xml.attributeDescriptorsProvider implementation="com.intellij.html.impl.MicrodataAttributeDescriptorsProvider"/>
 
     <breadcrumbsPresentationProvider implementation="com.intellij.codeInsight.daemon.impl.tagTreeHighlighting.XmlTagTreeBreadcrumbsPresentationProvider"/>
     <daemon.changeLocalityDetector implementation="com.intellij.xml.XmlChangeLocalityDetector"/>
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
index 9bf7bbdbd50a..5a3235ecce35 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
@@ -371,7 +371,7 @@ public class VfsUtilTest extends PlatformLangTestCase {
         }
       }.execute().throwException();
     }
-    final VirtualFile theChild = vDir.getChildren()[5111];
+    final VirtualFile theChild = vDir.findChild("5111.txt");
 
     PlatformTestUtil.startPerformanceTest("find child is slow", 450, new ThrowableRunnable() {
       @Override
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
index 61de655b0cc3..a76cddf1c283 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
@@ -273,6 +273,9 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
 
     jarParent.mkdir();
     FileUtil.copy(originalJar, jar);
+    assert jar.exists();
+    assert jarParent.exists();
+    assert jarParent.getParentFile().exists();
 
     refreshVFS();
 
@@ -330,6 +333,7 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
 
     jarParent.mkdir();
     FileUtil.copy(originalJar, jar);
+    assert jar.exists();
 
     refreshVFS();
 
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/ServiceMessageBuilder.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/ServiceMessageBuilder.java
index f2a57b227aa7..0ee49eaa1804 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/ServiceMessageBuilder.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/ServiceMessageBuilder.java
@@ -16,10 +16,12 @@
 package com.intellij.execution.testframework.sm;
 
 import jetbrains.buildServer.messages.serviceMessages.MapSerializerUtil;
+import jetbrains.buildServer.messages.serviceMessages.ServiceMessageTypes;
+import org.jetbrains.annotations.NotNull;
 
 /**
-* @author gregsh
-*/
+ * @author gregsh
+ */
 public class ServiceMessageBuilder {
   private final StringBuilder myText = new StringBuilder("##teamcity[");
 
@@ -41,25 +43,35 @@ public class ServiceMessageBuilder {
     return MapSerializerUtil.escapeStr(text, MapSerializerUtil.STD_ESCAPER);
   }
 
-  public static ServiceMessageBuilder testSuiteStarted(final String name) {
-    return new ServiceMessageBuilder("testSuiteStarted").addAttribute("name", name);
+  public static ServiceMessageBuilder testSuiteStarted(@NotNull String name) {
+    return new ServiceMessageBuilder(ServiceMessageTypes.TEST_SUITE_STARTED).addAttribute("name", name);
   }
-  public static ServiceMessageBuilder testSuiteFinished(final String name) {
-    return new ServiceMessageBuilder("testSuiteFinished").addAttribute("name", name);
+
+  public static ServiceMessageBuilder testSuiteFinished(@NotNull String name) {
+    return new ServiceMessageBuilder(ServiceMessageTypes.TEST_SUITE_FINISHED).addAttribute("name", name);
   }
-  public static ServiceMessageBuilder testStarted(final String name) {
-    return new ServiceMessageBuilder("testStarted").addAttribute("name", name);
+
+  public static ServiceMessageBuilder testStarted(@NotNull String name) {
+    return new ServiceMessageBuilder(ServiceMessageTypes.TEST_STARTED).addAttribute("name", name);
   }
-  public static ServiceMessageBuilder testFinished(final String name) {
-    return new ServiceMessageBuilder("testFinished").addAttribute("name", name);
+
+  public static ServiceMessageBuilder testFinished(@NotNull String name) {
+    return new ServiceMessageBuilder(ServiceMessageTypes.TEST_FINISHED).addAttribute("name", name);
   }
-  public static ServiceMessageBuilder testStdOut(final String name) {
-    return new ServiceMessageBuilder("testStdOut").addAttribute("name", name);
+
+  public static ServiceMessageBuilder testStdOut(@NotNull String name) {
+    return new ServiceMessageBuilder(ServiceMessageTypes.TEST_STD_OUT).addAttribute("name", name);
   }
-  public static ServiceMessageBuilder testStdErr(final String name) {
-    return new ServiceMessageBuilder("testStdErr").addAttribute("name", name);
+
+  public static ServiceMessageBuilder testStdErr(@NotNull String name) {
+    return new ServiceMessageBuilder(ServiceMessageTypes.TEST_STD_ERR).addAttribute("name", name);
   }
-  public static ServiceMessageBuilder testFailed(final String name) {
-    return new ServiceMessageBuilder("testFailed").addAttribute("name", name);
+
+  public static ServiceMessageBuilder testFailed(@NotNull String name) {
+    return new ServiceMessageBuilder(ServiceMessageTypes.TEST_FAILED).addAttribute("name", name);
+  }
+
+  public static ServiceMessageBuilder testIgnored(@NotNull String name) {
+    return new ServiceMessageBuilder(ServiceMessageTypes.TEST_IGNORED).addAttribute("name", name);
   }
 }
diff --git a/platform/util-rt/src/com/intellij/util/containers/Stack.java b/platform/util-rt/src/com/intellij/util/containers/Stack.java
index da0e9d8a99ac..7df0c93a9e55 100644
--- a/platform/util-rt/src/com/intellij/util/containers/Stack.java
+++ b/platform/util-rt/src/com/intellij/util/containers/Stack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package com.intellij.util.containers;
 
+import org.jetbrains.annotations.Nullable;
+
 import java.util.*;
 
 /**
@@ -24,6 +26,8 @@ import java.util.*;
  * @author max
  */
 public class Stack<T> extends ArrayList<T> {
+  public Stack() { }
+
   public Stack(int initialCapacity) {
     super(initialCapacity);
   }
@@ -32,7 +36,10 @@ public class Stack<T> extends ArrayList<T> {
     super(init);
   }
 
-  public Stack() {
+  public Stack(T... items) {
+    for (T item : items) {
+      push(item);
+    }
   }
 
   public void push(T t) {
@@ -51,6 +58,11 @@ public class Stack<T> extends ArrayList<T> {
     return remove(size - 1);
   }
 
+  @Nullable
+  public T tryPop() {
+    return isEmpty() ? null : pop();
+  }
+
   public boolean empty() {
     return isEmpty();
   }
@@ -58,7 +70,7 @@ public class Stack<T> extends ArrayList<T> {
   @Override
   public boolean equals(Object o) {
     if (o instanceof RandomAccess && o instanceof List) {
-      List other = (List) o;
+      List other = (List)o;
       if (size() != other.size()) {
         return false;
       }
@@ -66,7 +78,7 @@ public class Stack<T> extends ArrayList<T> {
       for (int i = 0; i < other.size(); i++) {
         Object o1 = other.get(i);
         Object o2 = get(i);
-        if (!(o1==null ? o2==null : o1.equals(o2))) {
+        if (!(o1 == null ? o2 == null : o1.equals(o2))) {
           return false;
         }
       }
diff --git a/platform/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java
index d26ff247cea4..04872b078ef2 100644
--- a/platform/util/src/com/intellij/openapi/util/IconLoader.java
+++ b/platform/util/src/com/intellij/openapi/util/IconLoader.java
@@ -347,6 +347,11 @@ public final class IconLoader {
     public int getIconHeight() {
       return getRealIcon().getIconHeight();
     }
+
+    @Override
+    public String toString() {
+      return myUrl.toString();
+    }
   }
 
   private static final class MyImageIcon extends ImageIcon {
diff --git a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
index 2f3824c93b4c..e2e017ac2466 100644
--- a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
@@ -136,7 +136,7 @@ public class JDOMUtil {
 
   @SuppressWarnings({"unchecked"})
   @NotNull
-  public static Object[] getChildNodesWithAttrs(final Element e) {
+  public static Object[] getChildNodesWithAttrs(@NotNull Element e) {
     ArrayList<Object> result = new ArrayList<Object>();
     result.addAll(e.getContent());
     result.addAll(e.getAttributes());
diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
index 2bf2eaf0dd4b..2da159165c07 100644
--- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
@@ -801,6 +801,22 @@ public class StringUtil extends StringUtilRt {
     return testee.startsWith(firstPrefix) && testee.regionMatches(l1, secondPrefix, 0, l2);
   }
 
+  /**
+   * Equivalent to testee.startsWith(firstPrefix + secondPrefix + thirdPrefix) but avoids creating an object for concatenation.
+   */
+  public static boolean startsWithConcatenationOf(@NotNull String testee,
+                                                  @NotNull String firstPrefix,
+                                                  @NotNull String secondPrefix,
+                                                  @NotNull String thirdPrefix) {
+    int l1 = firstPrefix.length();
+    int l2 = secondPrefix.length();
+    int l3 = thirdPrefix.length();
+    if (testee.length() < l1 + l2 + l3) return false;
+    return testee.startsWith(firstPrefix)
+           && testee.regionMatches(l1, secondPrefix, 0, l2)
+           && testee.regionMatches(l1 + l2, thirdPrefix, 0, l3);
+  }
+
   @NotNull
   public static String trimEnd(@NotNull String s, @NonNls @NotNull String suffix) {
     if (s.endsWith(suffix)) {
diff --git a/platform/util/src/com/intellij/util/ArrayUtil.java b/platform/util/src/com/intellij/util/ArrayUtil.java
index f62a09fda4ff..3f1470ad9a56 100644
--- a/platform/util/src/com/intellij/util/ArrayUtil.java
+++ b/platform/util/src/com/intellij/util/ArrayUtil.java
@@ -114,6 +114,14 @@ public class ArrayUtil extends ArrayUtilRt {
     array[array.length - 1] = value;
     return array;
   }
+  @NotNull
+  public static int[] insert(@NotNull int[] array, int index, int value) {
+    int[] result = new int[array.length + 1];
+    System.arraycopy(array, 0, result, 0, index);
+    result[index] = value;
+    System.arraycopy(array, index, result, index+1, array.length - index);
+    return result;
+  }
 
   @NotNull
   public static byte[] append(@NotNull byte[] array, byte value) {
diff --git a/platform/util/src/com/intellij/util/containers/Queue.java b/platform/util/src/com/intellij/util/containers/Queue.java
index cf73a493e961..96630491fbf5 100644
--- a/platform/util/src/com/intellij/util/containers/Queue.java
+++ b/platform/util/src/com/intellij/util/containers/Queue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ public class Queue<T> {
   private Object[] myArray;
   private int myFirst;
   private int myLast;
-
   // if true, elements are located at myFirst..myArray.length and 0..myLast
   // otherwise, they are at myFirst..myLast
   private boolean isWrapped;
@@ -50,18 +49,18 @@ public class Queue<T> {
       myLast = 0;
     }
   }
-  
+
   public T removeLast() {
     if (myLast == 0) {
       isWrapped = !isWrapped;
       myLast = myArray.length;
     }
     myLast--;
-    T result = (T)myArray[myLast];
+    @SuppressWarnings("unchecked") T result = (T)myArray[myLast];
     myArray[myLast] = null;
     return result;
   }
-  
+
 
   public boolean isEmpty() {
     return size() == 0;
@@ -94,17 +93,18 @@ public class Queue<T> {
     if (isEmpty()) {
       throw new IndexOutOfBoundsException("queue is empty");
     }
-    return (T)myArray[myFirst];
+    @SuppressWarnings("unchecked") T t = (T)myArray[myFirst];
+    return t;
   }
 
-  private int copyFromTo(int first, int last, T[] result, int destPos) {
+  private int copyFromTo(int first, int last, Object[] result, int destinationPos) {
     int length = last - first;
-    System.arraycopy(myArray, first, result, destPos, length);
+    System.arraycopy(myArray, first, result, destinationPos, length);
     return length;
   }
 
   private T[] normalize(int capacity) {
-    T[] result = (T[])new Object[capacity];
+    @SuppressWarnings("unchecked") T[] result = (T[])new Object[capacity];
     if (isWrapped) {
       int tailLength = copyFromTo(myFirst, myArray.length, result, 0);
       copyFromTo(0, myLast, result, tailLength);
@@ -127,31 +127,33 @@ public class Queue<T> {
       if (myFirst + index >= myArray.length) {
         arrayIndex = index - myArray.length + myFirst;
       }
-      else
+      else {
         arrayIndex = myFirst + index;
+      }
     }
     else {
       arrayIndex = myFirst + index;
     }
     final Object old = myArray[arrayIndex];
     myArray[arrayIndex] = value;
-    return (T)old;
+    @SuppressWarnings("unchecked") T t = (T)old;
+    return t;
   }
 
   public boolean process(@NotNull Processor<T> processor) {
     if (isWrapped) {
       for (int i = myFirst; i < myArray.length; i++) {
-        T t = (T)myArray[i];
+        @SuppressWarnings("unchecked") T t = (T)myArray[i];
         if (!processor.process(t)) return false;
       }
       for (int i = 0; i < myLast; i++) {
-        T t = (T)myArray[i];
+        @SuppressWarnings("unchecked") T t = (T)myArray[i];
         if (!processor.process(t)) return false;
       }
     }
     else {
       for (int i = myFirst; i < myLast; i++) {
-        T t = (T)myArray[i];
+        @SuppressWarnings("unchecked") T t = (T)myArray[i];
         if (!processor.process(t)) return false;
       }
     }
@@ -163,8 +165,14 @@ public class Queue<T> {
     if (isEmpty()) return "<empty>";
     List<Object> list = Arrays.asList(myArray);
     if (isWrapped) {
-      return "[[[ " +list.subList(0, myLast) + " ||| ... " + list.subList(myLast, myFirst) + " ... ||| " + list.subList(myFirst, myArray.length) + " ]]]";
+      return "[[[ " + list.subList(0, myLast) + " ||| ... " +
+             list.subList(myLast, myFirst) + " ... ||| " +
+             list.subList(myFirst, myArray.length) + " ]]]";
+    }
+    else {
+      return "[[[ ... " + list.subList(0, myFirst) + " ... ||| " +
+                 list.subList(myFirst, myLast) + " ||| ... " +
+                 list.subList(myFirst, myArray.length) + " ... ]]]";
     }
-    return "[[[ ... " +list.subList(0, myFirst) + " ... ||| " + list.subList(myFirst, myLast) + " ||| ... " + list.subList(myFirst, myArray.length) + " ... ]]]";
   }
 }
diff --git a/platform/util/src/com/intellij/util/xmlb/AbstractCollectionBinding.java b/platform/util/src/com/intellij/util/xmlb/AbstractCollectionBinding.java
index cf6db68d2dab..82ffb64e5b19 100644
--- a/platform/util/src/com/intellij/util/xmlb/AbstractCollectionBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/AbstractCollectionBinding.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.util.xmlb.annotations.AbstractCollection;
 import org.jdom.Content;
 import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -130,7 +131,7 @@ abstract class AbstractCollectionBinding implements Binding {
     }
   }
 
-  public Object deserialize(Object o, Object... nodes) {
+  public Object deserialize(Object o, @NotNull Object... nodes) {
     Collection result;
 
     if (getTagName(o) != null) {
diff --git a/platform/util/src/com/intellij/util/xmlb/AccessorBindingWrapper.java b/platform/util/src/com/intellij/util/xmlb/AccessorBindingWrapper.java
index 01daa631b141..75a5a28c8d93 100644
--- a/platform/util/src/com/intellij/util/xmlb/AccessorBindingWrapper.java
+++ b/platform/util/src/com/intellij/util/xmlb/AccessorBindingWrapper.java
@@ -16,6 +16,7 @@
 
 package com.intellij.util.xmlb;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 class AccessorBindingWrapper implements Binding {
@@ -33,7 +34,7 @@ class AccessorBindingWrapper implements Binding {
   }
 
   @Nullable
-  public Object deserialize(Object context, Object... nodes) {
+  public Object deserialize(Object context, @NotNull Object... nodes) {
     myAccessor.write(context, myBinding.deserialize(myAccessor.read(context), nodes));
     return context;
   }
diff --git a/platform/util/src/com/intellij/util/xmlb/AttributeBinding.java b/platform/util/src/com/intellij/util/xmlb/AttributeBinding.java
index 753db1a08dd5..1833947df827 100644
--- a/platform/util/src/com/intellij/util/xmlb/AttributeBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/AttributeBinding.java
@@ -19,6 +19,7 @@ package com.intellij.util.xmlb;
 import com.intellij.util.xmlb.annotations.Attribute;
 import org.jdom.Content;
 import org.jdom.Text;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class AttributeBinding implements Binding {
@@ -39,7 +40,7 @@ public class AttributeBinding implements Binding {
   }
 
   @Nullable
-  public Object deserialize(Object context, Object... nodes) {
+  public Object deserialize(Object context, @NotNull Object... nodes) {
     assert nodes.length == 1;
     Object node = nodes[0];
     assert isBoundTo(node);
diff --git a/platform/util/src/com/intellij/util/xmlb/BeanBinding.java b/platform/util/src/com/intellij/util/xmlb/BeanBinding.java
index a40a40ed6e3e..0f3433342385 100644
--- a/platform/util/src/com/intellij/util/xmlb/BeanBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/BeanBinding.java
@@ -60,6 +60,7 @@ class BeanBinding implements Binding {
     assert !StringUtil.isEmptyOrSpaces(myTagName) : "Bean name is empty: " + beanClass;
   }
 
+  @Override
   public void init() {
     initPropertyBindings(myBeanClass);
   }
@@ -72,6 +73,7 @@ class BeanBinding implements Binding {
     }
   }
 
+  @Override
   public Object serialize(Object o, Object context, SerializationFilter filter) {
     Element element = new Element(myTagName);
 
@@ -112,15 +114,16 @@ class BeanBinding implements Binding {
     }
   }
 
-  public void deserializeInto(final Object bean, final Element element) {
+  public void deserializeInto(final Object bean, @NotNull Element element) {
     _deserializeInto(bean, element);
   }
 
-  public Object deserialize(Object o, Object... nodes) {
+  @Override
+  public Object deserialize(Object o, @NotNull Object... nodes) {
     return _deserializeInto(instantiateBean(), nodes);
   }
 
-  private Object _deserializeInto(final Object result, final Object... aNodes) {
+  private Object _deserializeInto(final Object result, @NotNull Object... aNodes) {
     List<Object> nodes = new ArrayList<Object>();
     for (Object aNode : aNodes) {
       if (XmlSerializerImpl.isIgnoredNode(aNode)) continue;
@@ -181,10 +184,12 @@ class BeanBinding implements Binding {
     return result;
   }
 
+  @Override
   public boolean isBoundTo(Object node) {
     return node instanceof Element && ((Element)node).getName().equals(myTagName);
   }
 
+  @Override
   public Class getBoundNodeType() {
     return Element.class;
   }
diff --git a/platform/util/src/com/intellij/util/xmlb/Binding.java b/platform/util/src/com/intellij/util/xmlb/Binding.java
index 841b45f3094f..53e77dc54bb4 100644
--- a/platform/util/src/com/intellij/util/xmlb/Binding.java
+++ b/platform/util/src/com/intellij/util/xmlb/Binding.java
@@ -15,13 +15,14 @@
  */
 package com.intellij.util.xmlb;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 interface Binding {
   Object serialize(Object o, @Nullable Object context, SerializationFilter filter);
 
   @Nullable
-  Object deserialize(Object context, Object... nodes);
+  Object deserialize(Object context, @NotNull Object... nodes);
 
   boolean isBoundTo(Object node);
 
diff --git a/platform/util/src/com/intellij/util/xmlb/JDOMElementBinding.java b/platform/util/src/com/intellij/util/xmlb/JDOMElementBinding.java
index 5d2f59fdc4a7..2c239b9e56ff 100644
--- a/platform/util/src/com/intellij/util/xmlb/JDOMElementBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/JDOMElementBinding.java
@@ -18,6 +18,7 @@ package com.intellij.util.xmlb;
 
 import com.intellij.util.xmlb.annotations.Tag;
 import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -57,7 +58,7 @@ class JDOMElementBinding implements Binding {
   }
 
   @Nullable
-  public Object deserialize(Object context, Object... nodes) {
+  public Object deserialize(Object context, @NotNull Object... nodes) {
     Element[] result = new Element[nodes.length];
 
     System.arraycopy(nodes, 0, result, 0, nodes.length);
diff --git a/platform/util/src/com/intellij/util/xmlb/MapBinding.java b/platform/util/src/com/intellij/util/xmlb/MapBinding.java
index 04435889b525..74be73e3ea7c 100644
--- a/platform/util/src/com/intellij/util/xmlb/MapBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/MapBinding.java
@@ -23,6 +23,7 @@ import org.jdom.Attribute;
 import org.jdom.Content;
 import org.jdom.Element;
 import org.jdom.Text;
+import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -134,7 +135,7 @@ class MapBinding implements Binding {
     return myMapAnnotation == null ? KEY : myMapAnnotation.keyAttributeName();
   }
 
-  public Object deserialize(Object o, Object... nodes) {
+  public Object deserialize(Object o, @NotNull Object... nodes) {
     Map map = (Map)o;
     map.clear();
 
diff --git a/platform/util/src/com/intellij/util/xmlb/OptionTagBinding.java b/platform/util/src/com/intellij/util/xmlb/OptionTagBinding.java
index ad7bd15e67f9..2995bbcf4cdc 100644
--- a/platform/util/src/com/intellij/util/xmlb/OptionTagBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/OptionTagBinding.java
@@ -25,6 +25,7 @@ import org.jdom.Content;
 import org.jdom.Element;
 import org.jdom.Text;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -80,7 +81,7 @@ class OptionTagBinding implements Binding {
     return targetElement;
   }
 
-  public Object deserialize(Object o, Object... nodes) {
+  public Object deserialize(Object o, @NotNull Object... nodes) {
     if (nodes.length > 1) {
       LOG.info("Duplicate options for " + o + " will be ignored");
     }
diff --git a/platform/util/src/com/intellij/util/xmlb/PrimitiveValueBinding.java b/platform/util/src/com/intellij/util/xmlb/PrimitiveValueBinding.java
index 61e934cb0214..7a0c23ac681b 100644
--- a/platform/util/src/com/intellij/util/xmlb/PrimitiveValueBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/PrimitiveValueBinding.java
@@ -18,6 +18,7 @@ package com.intellij.util.xmlb;
 
 import com.intellij.openapi.util.JDOMUtil;
 import org.jdom.Text;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 class PrimitiveValueBinding implements Binding {
@@ -33,7 +34,7 @@ class PrimitiveValueBinding implements Binding {
   }
 
   @Nullable
-  public Object deserialize(Object o, Object... nodes) {
+  public Object deserialize(Object o, @NotNull Object... nodes) {
     assert nodes != null;
 
     if (nodes.length == 0) {
diff --git a/platform/util/src/com/intellij/util/xmlb/TagBinding.java b/platform/util/src/com/intellij/util/xmlb/TagBinding.java
index 87ae313d2ab1..087f24264c7a 100644
--- a/platform/util/src/com/intellij/util/xmlb/TagBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/TagBinding.java
@@ -22,6 +22,7 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.xmlb.annotations.Tag;
 import org.jdom.Element;
 import org.jdom.Text;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,7 +54,7 @@ class TagBinding implements Binding {
     return v;
   }
 
-  public Object deserialize(Object o, Object... nodes) {
+  public Object deserialize(Object o, @NotNull Object... nodes) {
     assert nodes.length > 0;
     Object[] children;
     if (nodes.length == 1) {
diff --git a/platform/util/src/com/intellij/util/xmlb/TagBindingWrapper.java b/platform/util/src/com/intellij/util/xmlb/TagBindingWrapper.java
index 5b414b894258..6fc29fe43c81 100644
--- a/platform/util/src/com/intellij/util/xmlb/TagBindingWrapper.java
+++ b/platform/util/src/com/intellij/util/xmlb/TagBindingWrapper.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.util.JDOMUtil;
 import org.jdom.Content;
 import org.jdom.Element;
 import org.jdom.Text;
+import org.jetbrains.annotations.NotNull;
 
 //todo: merge with option tag binding
 class TagBindingWrapper implements Binding {
@@ -51,7 +52,7 @@ class TagBindingWrapper implements Binding {
     return e;
   }
 
-  public Object deserialize(Object context, Object... nodes) {
+  public Object deserialize(Object context, @NotNull Object... nodes) {
     assert nodes.length == 1;
 
     Element e = (Element)nodes[0];
diff --git a/platform/util/src/com/intellij/util/xmlb/TextBinding.java b/platform/util/src/com/intellij/util/xmlb/TextBinding.java
index ff6bed258705..9419e5b0b9d2 100644
--- a/platform/util/src/com/intellij/util/xmlb/TextBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/TextBinding.java
@@ -18,6 +18,7 @@ package com.intellij.util.xmlb;
 
 import org.jdom.Content;
 import org.jdom.Text;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class TextBinding implements Binding {
@@ -36,7 +37,7 @@ public class TextBinding implements Binding {
   }
 
   @Nullable
-  public Object deserialize(Object context, Object... nodes) {
+  public Object deserialize(Object context, @NotNull Object... nodes) {
     assert nodes.length == 1;
     Object node = nodes[0];
     assert isBoundTo(node);
diff --git a/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java b/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java
index 6a2e264aa0d4..7b78227b0e50 100644
--- a/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java
+++ b/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.util.JDOMUtil;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
@@ -28,6 +29,7 @@ import java.net.URL;
 
 public class XmlSerializer {
   private static final SerializationFilter TRUE_FILTER = new SerializationFilter() {
+    @Override
     public boolean accepts(Accessor accessor, Object bean) {
       return true;
     }
@@ -54,8 +56,7 @@ public class XmlSerializer {
   @SuppressWarnings({"unchecked"})
   public static <T> T deserialize(Element element, Class<T> aClass) throws XmlSerializationException {
     try {
-      XmlSerializerImpl serializer = new XmlSerializerImpl(TRUE_FILTER);
-      return (T)serializer.getBinding(aClass).deserialize(null, element);
+      return (T)XmlSerializerImpl.getBinding(aClass).deserialize(null, element);
     }
     catch (XmlSerializationException e) {
       throw e;
@@ -91,10 +92,9 @@ public class XmlSerializer {
     }
   }
 
-  public static void deserializeInto(final Object bean, final Element element) {
+  public static void deserializeInto(@NotNull Object bean, @NotNull Element element) {
     try {
-      XmlSerializerImpl serializer = new XmlSerializerImpl(TRUE_FILTER);
-      final Binding binding = serializer.getBinding(bean.getClass());
+      final Binding binding = XmlSerializerImpl.getBinding(bean.getClass());
       assert binding instanceof BeanBinding;
 
       ((BeanBinding)binding).deserializeInto(bean, element);
@@ -116,8 +116,7 @@ public class XmlSerializer {
       filter = TRUE_FILTER;
     }
     try {
-      XmlSerializerImpl serializer = new XmlSerializerImpl(filter);
-      final Binding binding = serializer.getBinding(bean.getClass());
+      final Binding binding = XmlSerializerImpl.getBinding(bean.getClass());
       assert binding instanceof BeanBinding;
 
       ((BeanBinding)binding).serializeInto(bean, element, filter);
diff --git a/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java b/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java
index 2a319eb07638..49959390248f 100644
--- a/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java
+++ b/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java
@@ -61,7 +61,7 @@ class XmlSerializerImpl {
     if (type instanceof Class) {
       return _getClassBinding((Class<?>)type, type, accessor);
     }
-    else if (type instanceof ParameterizedType) {
+    if (type instanceof ParameterizedType) {
       ParameterizedType parameterizedType = (ParameterizedType)type;
       Type rawType = parameterizedType.getRawType();
       assert rawType instanceof Class;
@@ -154,7 +154,7 @@ class XmlSerializerImpl {
   }
 
   public static boolean isIgnoredNode(final Object child) {
-    if (child instanceof Text && ((Text)child).getValue().trim().length() == 0) {
+    if (child instanceof Text && ((Text)child).getValue().trim().isEmpty()) {
       return true;
     }
     if (child instanceof Comment) {
@@ -163,7 +163,7 @@ class XmlSerializerImpl {
     if (child instanceof Attribute) {
       Attribute attr = (Attribute)child;
       final String namespaceURI = attr.getNamespaceURI();
-      if (namespaceURI != null && namespaceURI.length() > 0) return true;
+      if (namespaceURI != null && !namespaceURI.isEmpty()) return true;
     }
 
     return false;
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java
index 16eb0e6ddbd4..aff7d2504594 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -376,6 +376,11 @@ public class XBreakpointBase<Self extends XBreakpoint<P>, P extends XBreakpointP
       return new ToggleBreakpointGutterIconAction(XBreakpointBase.this);
     }
 
+    @Override
+    public Alignment getAlignment() {
+      return Alignment.RIGHT;
+    }
+
     @Nullable
     public ActionGroup getPopupMenuActions() {
       DefaultActionGroup group = new DefaultActionGroup();
diff --git a/plugins/gradle/resources/i18n/GradleBundle.properties b/plugins/gradle/resources/i18n/GradleBundle.properties
index df9969acd658..d0624415b827 100644
--- a/plugins/gradle/resources/i18n/GradleBundle.properties
+++ b/plugins/gradle/resources/i18n/GradleBundle.properties
@@ -26,8 +26,9 @@ gradle.import.structure.settings.label.project.config.location=Project location:
 gradle.import.structure.settings.title.project.config.location=Project location
 gradle.import.structure.settings.label.project.compile.output.location=Project compiler output:
 gradle.import.structure.settings.title.project.compile.output.location=Project compiler output
-gradle.import.structure.settings.label.module.config.location=Module file location:
-gradle.import.structure.settings.title.module.config.location=Module file location
+gradle.import.structure.settings.label.iml.location=Module files location:
+gradle.import.structure.settings.label.iml.location.per.module=module content root
+gradle.import.structure.settings.label.iml.location.project.dir=project dir
 gradle.import.structure.settings.label.export=Exported:
 gradle.import.structure.settings.label.scope=Scope:
 gradle.import.structure.settings.label.root.source=Source roots:
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChangesCalculator.java
index 316d87aa4e0b..d784448964ea 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/autoimport/GradleUserProjectChangesCalculator.java
@@ -137,7 +137,10 @@ public class GradleUserProjectChangesCalculator {
   public void filterOutdatedChanges() {
     Set<GradleUserProjectChange> changes = ContainerUtilRt.newHashSet(mySettings.getUserProjectChanges());
     for (GradleUserProjectChange change : mySettings.getUserProjectChanges()) {
-      if (!isUpToDate(change)) {
+      if (isUpToDate(change)) {
+        change.setTimestamp(System.currentTimeMillis());
+      }
+      else {
         changes.remove(change);
       }
     }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleAdjustImportSettingsUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleAdjustImportSettingsUtil.java
index 1fefd3a3b99b..b309b0014431 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleAdjustImportSettingsUtil.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleAdjustImportSettingsUtil.java
@@ -11,8 +11,6 @@ import org.jetbrains.plugins.gradle.util.GradleBundle;
 import org.jetbrains.plugins.gradle.util.GradleUtil;
 
 import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
 
 /**
  * @author Denis Zhdanov
@@ -23,41 +21,6 @@ public class GradleAdjustImportSettingsUtil {
   private GradleAdjustImportSettingsUtil() {
   }
 
-  /**
-   * Setups given builder to expose controls for management of the given component's name.
-   *
-   * @param builder    target settings builder
-   * @param component  component which name management should be exposed
-   * @return    UI control that holds target component's name
-   */
-  @NotNull
-  public static JTextField configureNameControl(@NotNull GradleProjectSettingsBuilder builder, @NotNull final Named component) {
-    final JTextField result = new JTextField();
-    result.setText(component.getName());
-    builder.add("gradle.import.structure.settings.label.name", result);
-    result.getDocument().addDocumentListener(new DocumentListener() {
-      @Override
-      public void insertUpdate(DocumentEvent e) {
-        applyNewName();
-      }
-      @Override
-      public void removeUpdate(DocumentEvent e) {
-        applyNewName();
-      }
-      @Override
-      public void changedUpdate(DocumentEvent e) {
-      }
-      private void applyNewName() {
-        String text = result.getText();
-        if (text == null) {
-          return;
-        }
-        component.setName(text.trim());
-      }
-    });
-    return result;
-  }
-
   /**
    * Performs generic check of the name of the given component.
    * 
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleModuleSettings.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleModuleSettings.java
index 502063ec0284..3bc37e8ad1b5 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleModuleSettings.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleModuleSettings.java
@@ -15,7 +15,6 @@ import org.jetbrains.plugins.gradle.util.GradleUtil;
 import javax.swing.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.io.File;
 
 /**
  * Manages settings of {@link GradleModule gradle module} component.
@@ -27,8 +26,6 @@ public class GradleModuleSettings implements GradleProjectStructureNodeSettings
 
   private final JComponent                myComponent;
   private final GradleModule              myModule;
-  private final JTextField                myNameControl;
-  private final TextFieldWithBrowseButton myModuleFileLocationField;
   private final JRadioButton              myInheritProjectCompileOutputPathButton;
   private final JRadioButton              myUseModuleCompileOutputPathButton;
   private final TextFieldWithBrowseButton myOutputLocationField;
@@ -37,8 +34,6 @@ public class GradleModuleSettings implements GradleProjectStructureNodeSettings
   public GradleModuleSettings(@NotNull GradleModule module) {
     myModule = module;
     GradleProjectSettingsBuilder builder = new GradleProjectSettingsBuilder();
-    myNameControl = GradleAdjustImportSettingsUtil.configureNameControl(builder, myModule);
-    myModuleFileLocationField = setupModuleFileLocation(builder);
     Pair<JRadioButton, JRadioButton> pair = setupCompileOutput(builder);
     myInheritProjectCompileOutputPathButton = pair.first;
     myUseModuleCompileOutputPathButton = pair.second;
@@ -70,15 +65,6 @@ public class GradleModuleSettings implements GradleProjectStructureNodeSettings
     return new Pair<JRadioButton, JRadioButton>(inheritButton, moduleButton);
   }
   
-  @NotNull
-  private static TextFieldWithBrowseButton setupModuleFileLocation(@NotNull GradleProjectSettingsBuilder builder) {
-    TextFieldWithBrowseButton result = new TextFieldWithBrowseButton();
-    String title = GradleBundle.message("gradle.import.structure.settings.title.module.config.location");
-    result.addBrowseFolderListener(title, "", null, BrowseFilesListener.SINGLE_DIRECTORY_DESCRIPTOR);
-    builder.add("gradle.import.structure.settings.label.module.config.location", result);
-    return result;
-  }
-  
   @NotNull
   private static Pair<TextFieldWithBrowseButton, TextFieldWithBrowseButton> setupOutputLocation(
     @NotNull GradleProjectSettingsBuilder builder)
@@ -98,19 +84,6 @@ public class GradleModuleSettings implements GradleProjectStructureNodeSettings
 
   @Override
   public boolean validate() {
-    if (!GradleAdjustImportSettingsUtil.validate(myModule, myNameControl)) {
-      return false;
-    }
-    String moduleFileDir = myModuleFileLocationField.getText();
-    if (moduleFileDir == null || StringUtil.isEmpty(moduleFileDir.trim())) {
-      GradleUtil.showBalloon(
-        myModuleFileLocationField,
-        MessageType.ERROR,
-        GradleBundle.message("gradle.import.text.error.module.undefined.config.location")
-      );
-      return false;
-    }
-    myModule.setModuleFileDirectoryPath(moduleFileDir.trim());
     if (myUseModuleCompileOutputPathButton.isSelected()) {
       String outputLocation = myOutputLocationField.getText();
       if (outputLocation == null || StringUtil.isEmpty(outputLocation.trim())) {
@@ -139,8 +112,6 @@ public class GradleModuleSettings implements GradleProjectStructureNodeSettings
 
   @Override
   public void refresh() {
-    myNameControl.setText(myModule.getName());
-    myModuleFileLocationField.setText(new File(myModule.getModuleFilePath()).getParent());
     if (myModule.isInheritProjectCompileOutputPath()) {
       myInheritProjectCompileOutputPathButton.setSelected(true);
     }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleProjectSettings.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleProjectSettings.java
index 429563fa33b2..133b04eb3fcd 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleProjectSettings.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/wizard/adjust/GradleProjectSettings.java
@@ -1,27 +1,35 @@
 package org.jetbrains.plugins.gradle.manage.wizard.adjust;
 
 import com.intellij.ide.util.BrowseFilesListener;
+import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.projectRoots.JavaSdk;
 import com.intellij.openapi.projectRoots.JavaSdkVersion;
 import com.intellij.openapi.projectRoots.ProjectJdkTable;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.io.FileUtilRt;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.pom.java.LanguageLevel;
+import com.intellij.ui.components.JBRadioButton;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
+import org.jetbrains.plugins.gradle.model.gradle.GradleContentRoot;
+import org.jetbrains.plugins.gradle.model.gradle.GradleModule;
 import org.jetbrains.plugins.gradle.model.gradle.GradleProject;
 import org.jetbrains.plugins.gradle.util.GradleBundle;
 import org.jetbrains.plugins.gradle.util.GradleUtil;
 
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.*;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Manages settings of {@link GradleProject gradle project} component.
@@ -30,28 +38,33 @@ import java.util.Map;
  * @since 8/12/11 2:58 PM
  */
 public class GradleProjectSettings implements GradleProjectStructureNodeSettings {
-
-  private final JComponent                myComponent;
-  private final GradleProject             myProject;
-  private final JTextField                myNameControl;
-  private final JComboBox                 myLanguageLevelComboBox;
-  private final DefaultComboBoxModel      mySdkModel;
-  private final TextFieldWithBrowseButton myProjectConfigLocationField;
-  private final TextFieldWithBrowseButton myProjectCompileOutputLocationField;
   
+  private static final String KEEP_IML_AT_MODULE_DIR_PROPERTY_KEY = "gradle.iml.at.module.dir";
+  
+  @NotNull private final JComponent                myComponent;
+  @NotNull private final GradleProject             myProject;
+  @NotNull private final JComboBox                 myLanguageLevelComboBox;
+  @NotNull private final DefaultComboBoxModel      mySdkModel;
+  @NotNull private final TextFieldWithBrowseButton myProjectConfigLocationField;
+  @NotNull private final TextFieldWithBrowseButton myProjectCompileOutputLocationField;
+  @NotNull private final JRadioButton              myImlAtModuleContentRootsButton;
+  @NotNull private final JRadioButton              myImlAtProjectDirButton;
+
   public GradleProjectSettings(@NotNull GradleProject project) {
     myProject = project;
     GradleProjectSettingsBuilder builder = new GradleProjectSettingsBuilder();
-    myNameControl = GradleAdjustImportSettingsUtil.configureNameControl(builder, project);
     myLanguageLevelComboBox = setupLanguageLevelControls(builder);
     setupSdkControls(mySdkModel = new DefaultComboBoxModel(), builder);
     myProjectConfigLocationField = setupProjectConfigLocation(builder);
     myProjectCompileOutputLocationField = setupProjectCompileOutputLocation(builder);
-    filterSdksByLanguageLevel();    
+    filterSdksByLanguageLevel();
+    myImlAtModuleContentRootsButton = new JBRadioButton(GradleBundle.message("gradle.import.structure.settings.label.iml.location.per.module"));
+    myImlAtProjectDirButton = new JBRadioButton(GradleBundle.message("gradle.import.structure.settings.label.iml.location.project.dir"));
+    setModuleFilesLocationControl(builder);
     myComponent = builder.build();
     refresh();
   }
-  
+
   private JComboBox setupLanguageLevelControls(@NotNull GradleProjectSettingsBuilder builder) {
     JComboBox result = new JComboBox();
     final Map<Object, LanguageLevel> levels = new HashMap<Object, LanguageLevel>();
@@ -140,14 +153,62 @@ public class GradleProjectSettings implements GradleProjectStructureNodeSettings
     builder.add("gradle.import.structure.settings.label.project.compile.output.location", result);
     return result;
   }
+
+  private void setModuleFilesLocationControl(@NotNull GradleProjectSettingsBuilder builder) {
+    ButtonGroup group = new ButtonGroup();
+    group.add(myImlAtModuleContentRootsButton);
+    group.add(myImlAtProjectDirButton);
+    JPanel panel = new JPanel(new GridLayout(2, 1));
+    panel.add(myImlAtModuleContentRootsButton);
+    panel.add(myImlAtProjectDirButton);
+    myImlAtModuleContentRootsButton.addItemListener(new ItemListener() {
+      @Override
+      public void itemStateChanged(ItemEvent e) {
+        if (e.getStateChange() != ItemEvent.SELECTED) {
+          return;
+        }
+        for (GradleModule module : myProject.getModules()) {
+          Collection<GradleContentRoot> contentRoots = module.getContentRoots();
+          if (contentRoots.isEmpty()) {
+            continue;
+          }
+          module.setModuleFileDirectoryPath(contentRoots.iterator().next().getRootPath());
+        }
+        PropertiesComponent.getInstance().setValue(KEEP_IML_AT_MODULE_DIR_PROPERTY_KEY, String.valueOf(true));
+      }
+    });
+    myImlAtProjectDirButton.addItemListener(new ItemListener() {
+      @Override
+      public void itemStateChanged(ItemEvent e) {
+        if (e.getStateChange() != ItemEvent.SELECTED) {
+          return;
+        }
+        String dirPath = myProjectConfigLocationField.getText();
+        if (StringUtil.isEmpty(dirPath)) {
+          return;
+        }
+        boolean goodDir = FileUtilRt.createDirectory(new File(dirPath));
+        if (!goodDir) {
+          return;
+        }
+        for (GradleModule module : myProject.getModules()) {
+          module.setModuleFileDirectoryPath(dirPath);
+        }
+        PropertiesComponent.getInstance().setValue(KEEP_IML_AT_MODULE_DIR_PROPERTY_KEY, String.valueOf(false));
+      }
+    });
+    boolean imlAtModuleDir = PropertiesComponent.getInstance().getBoolean(KEEP_IML_AT_MODULE_DIR_PROPERTY_KEY, true);
+    if (imlAtModuleDir) {
+      myImlAtModuleContentRootsButton.setSelected(true);
+    }
+    else {
+      myImlAtProjectDirButton.setSelected(true);
+    }
+    builder.add("gradle.import.structure.settings.label.iml.location", panel);
+  }
   
   @Override
   public boolean validate() {
-    boolean nameIsValid = GradleAdjustImportSettingsUtil.validate(myProject, myNameControl);
-    if (!nameIsValid) {
-      return false;
-    }
-    
     if (!validateDirLocation(myProjectConfigLocationField, "gradle.import.text.error.project.undefined.config.location",
                              "gradle.import.text.error.file.config.location"))
     {
@@ -167,7 +228,6 @@ public class GradleProjectSettings implements GradleProjectStructureNodeSettings
 
   @Override
   public void refresh() {
-    myNameControl.setText(myProject.getName());
     myProjectConfigLocationField.setText(myProject.getProjectFileDirectoryPath());
     myProjectCompileOutputLocationField.setText(myProject.getCompileOutputPath());
     myLanguageLevelComboBox.setSelectedItem(myProject.getLanguageLevel().getPresentableText());
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
index a4302558a359..4a4c3227e360 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
@@ -581,7 +581,12 @@ public class GradleUtil {
     };
 
     if (synchronous) {
-      UIUtil.invokeAndWaitIfNeeded(wrappedTask);
+      if (ApplicationManager.getApplication().isDispatchThread()) {
+        wrappedTask.run();
+      }
+      else {
+        UIUtil.invokeAndWaitIfNeeded(wrappedTask);
+      }
     }
     else {
       UIUtil.invokeLaterIfNeeded(wrappedTask);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrAliasAnnotationChecker.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrAliasAnnotationChecker.java
index a379b76cda3b..fc1071d13a40 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrAliasAnnotationChecker.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrAliasAnnotationChecker.java
@@ -21,12 +21,9 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.GroovyBundle;
-import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifierList;
 import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotation;
 import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationNameValuePair;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement;
 import org.jetbrains.plugins.groovy.lang.psi.impl.auxiliary.modifiers.GrAnnotationCollector;
 import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
@@ -39,32 +36,20 @@ import java.util.Set;
  * @author Max Medvedev
  */
 public class GrAliasAnnotationChecker extends CustomAnnotationChecker {
-  @Nullable
-  private static GrTypeDefinition resolveAlias(@NotNull GrAnnotation annotation) {
-    final GrCodeReferenceElement ref = annotation.getClassReference();
-
-    final PsiElement resolved = ref.resolve();
-    if (GrAnnotationCollector.findAnnotationCollector(resolved) != null) {
-      assert resolved instanceof GrTypeDefinition;
-      return ((GrTypeDefinition)(resolved));
-    }
-
-
-    return null;
-  }
 
   @Override
   public boolean checkApplicability(@NotNull AnnotationHolder holder, @NotNull GrAnnotation annotation) {
-    final GrTypeDefinition alias = resolveAlias(annotation);
-    if (alias == null) {
+    final GrAnnotation annotationCollector = GrAnnotationCollector.findAnnotationCollector(annotation);
+    if (annotationCollector == null) {
       return false;
     }
 
     final GrCodeReferenceElement ref = annotation.getClassReference();
 
-    final GrModifierList list = alias.getModifierList();
-    assert list != null;
-    for (GrAnnotation anno : list.getRawAnnotations()) {
+    final ArrayList<GrAnnotation> aliasedAnnotations = ContainerUtil.newArrayList();
+    GrAnnotationCollector.collectAnnotations(aliasedAnnotations, annotation, annotationCollector);
+
+    for (GrAnnotation anno : aliasedAnnotations) {
       if (GroovyCommonClassNames.GROOVY_TRANSFORM_ANNOTATION_COLLECTOR.equals(anno.getQualifiedName())) continue;
       final String description = CustomAnnotationChecker.isAnnotationApplicable(anno, annotation.getParent());
       if (description != null) {
@@ -77,14 +62,12 @@ public class GrAliasAnnotationChecker extends CustomAnnotationChecker {
 
   @Override
   public boolean checkArgumentList(@NotNull AnnotationHolder holder, @NotNull GrAnnotation annotation) {
-    final GrTypeDefinition alias = resolveAlias(annotation);
-    if (alias == null) {
+    final GrAnnotation annotationCollector = GrAnnotationCollector.findAnnotationCollector(annotation);
+    if (annotationCollector == null) {
       return false;
     }
 
     final ArrayList<GrAnnotation> annotations = ContainerUtil.newArrayList();
-    final GrAnnotation annotationCollector = GrAnnotationCollector.findAnnotationCollector(alias);
-    assert annotationCollector != null;
     final Set<String> usedAttributes = GrAnnotationCollector.collectAnnotations(annotations, annotation, annotationCollector);
 
     final GrCodeReferenceElement ref = annotation.getClassReference();
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
index 8e1810d0a3dc..bc09365a7ce3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
@@ -799,7 +799,7 @@ public class GroovyAnnotator extends GroovyElementVisitor implements Annotator {
     PsiElement resolved = refElement.resolve();
     if (resolved instanceof PsiClass &&
         (((PsiClass)resolved).isAnnotationType() ||
-                                         GrAnnotationCollector.findAnnotationCollector(resolved) != null &&
+                                         GrAnnotationCollector.findAnnotationCollector((PsiClass)resolved) != null &&
                                          refElement.getParent() instanceof GrAnnotation)) {
       myHolder.createInfoAnnotation(refElement, null).setTextAttributes(ANNOTATION);
     }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
index 142cc63ad193..bcdc5b3d9142 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,6 +76,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement;
 import org.jetbrains.plugins.groovy.lang.psi.dataFlow.types.TypeInferenceHelper;
 import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyResolveResultImpl;
 import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
+import org.jetbrains.plugins.groovy.lang.psi.impl.auxiliary.modifiers.GrAnnotationCollector;
 import org.jetbrains.plugins.groovy.lang.psi.util.GdkMethodUtil;
 import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil;
 import org.jetbrains.plugins.groovy.refactoring.GroovyRefactoringUtil;
@@ -573,12 +574,35 @@ public class GroovyCompletionUtil {
     if (anno != null) {
       GrCodeReferenceElement ref = anno.getClassReference();
       PsiElement resolved = ref.resolve();
-      if (resolved instanceof PsiClass && ((PsiClass)resolved).isAnnotationType()) {
-        List<LookupElement> result = new ArrayList<LookupElement>();
-        for (PsiMethod method : ((PsiClass)resolved).getMethods()) {
-          result.addAll(createLookupElements(new GroovyResolveResultImpl(method, true), false, matcher, null));
+
+      if (resolved instanceof PsiClass) {
+        final GrAnnotation annotationCollector = GrAnnotationCollector.findAnnotationCollector((PsiClass)resolved);
+
+        if (annotationCollector != null) {
+          final ArrayList<GrAnnotation> annotations = ContainerUtil.newArrayList();
+          GrAnnotationCollector.collectAnnotations(annotations, anno, annotationCollector);
+
+          Set<String> usedNames = ContainerUtil.newHashSet();
+          List<LookupElement> result = new ArrayList<LookupElement>();
+          for (GrAnnotation annotation : annotations) {
+            final PsiElement resolvedAliased = annotation.getClassReference().resolve();
+            if (resolvedAliased instanceof PsiClass && ((PsiClass)resolvedAliased).isAnnotationType()) {
+              for (PsiMethod method : ((PsiClass)resolvedAliased).getMethods()) {
+                if (usedNames.add(method.getName())) {
+                  result.addAll(createLookupElements(new GroovyResolveResultImpl(method, true), false, matcher, null));
+                }
+              }
+            }
+          }
+          return result;
+        }
+        else if (((PsiClass)resolved).isAnnotationType()) {
+          List<LookupElement> result = new ArrayList<LookupElement>();
+          for (PsiMethod method : ((PsiClass)resolved).getMethods()) {
+            result.addAll(createLookupElements(new GroovyResolveResultImpl(method, true), false, matcher, null));
+          }
+          return result;
         }
-        return result;
       }
     }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java
index 85ecc72a93ad..3d074c17f6c0 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java
@@ -178,13 +178,15 @@ public class GrAnnotationNameValuePairImpl extends GroovyPsiElementImpl implemen
       String declaredName = getName();
       String name = declaredName == null ? PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME : declaredName;
 
-      final GrAnnotation collector = GrAnnotationCollector.findAnnotationCollector(resolved);
-      if (collector != null) {
-        return multiResolveFromAlias(annotation, name, collector);
-      }
+      if (resolved instanceof PsiClass) {
+        final GrAnnotation collector = GrAnnotationCollector.findAnnotationCollector((PsiClass)resolved);
+        if (collector != null) {
+          return multiResolveFromAlias(annotation, name, collector);
+        }
 
-      if (resolved instanceof PsiClass && ((PsiClass)resolved).isAnnotationType()) {
-        return multiResolveFromAnnotationType((PsiClass)resolved, name);
+        if (((PsiClass)resolved).isAnnotationType()) {
+          return multiResolveFromAnnotationType((PsiClass)resolved, name);
+        }
       }
     }
     return GroovyResolveResult.EMPTY_ARRAY;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrAnnotationCollector.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrAnnotationCollector.java
index 0175323e7e9d..7b9710e932e4 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrAnnotationCollector.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrAnnotationCollector.java
@@ -26,6 +26,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.
 import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationNameValuePair;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
+import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement;
 import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrLightAnnotation;
 import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
 
@@ -42,8 +43,7 @@ public class GrAnnotationCollector {
 
     List<GrAnnotation> result = ContainerUtil.newArrayList();
     for (GrAnnotation annotation : rawAnnotations) {
-      final PsiElement resolved = annotation.getClassReference().resolve();
-      final GrAnnotation annotationCollector = findAnnotationCollector(resolved);
+      final GrAnnotation annotationCollector = findAnnotationCollector(annotation);
       if (annotationCollector != null) {
         collectAnnotations(result, annotation, annotationCollector);
       }
@@ -58,8 +58,7 @@ public class GrAnnotationCollector {
 
   private static boolean hasAliases(GrAnnotation[] rawAnnotations) {
     for (GrAnnotation annotation : rawAnnotations) {
-      final PsiElement resolved = annotation.getClassReference().resolve();
-      final GrAnnotation annotationCollector = findAnnotationCollector(resolved);
+      final GrAnnotation annotationCollector = findAnnotationCollector(annotation);
       if (annotationCollector != null) {
         return true;
       }
@@ -164,7 +163,7 @@ public class GrAnnotationCollector {
   }
 
   @Nullable
-  public static GrAnnotation findAnnotationCollector(PsiElement clazz) {
+  public static GrAnnotation findAnnotationCollector(PsiClass clazz) {
     if (clazz instanceof GrTypeDefinition) {
       final GrModifierList modifierList = ((GrTypeDefinition)clazz).getModifierList();
       if (modifierList != null) {
@@ -178,4 +177,18 @@ public class GrAnnotationCollector {
 
     return null;
   }
+
+
+  @Nullable
+  public static GrAnnotation findAnnotationCollector(@NotNull GrAnnotation annotation) {
+    final GrCodeReferenceElement ref = annotation.getClassReference();
+
+    final PsiElement resolved = ref.resolve();
+    if (resolved instanceof PsiClass) {
+      return findAnnotationCollector((PsiClass)resolved);
+    }
+    else {
+      return null;
+    }
+  }
 }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
index 11d29c2081e8..a8261d7b5d92 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
@@ -1672,6 +1672,38 @@ void foo() {
 }""")
   }
 
+  public void testAliasAnnotation() {
+    myFixture.addClass '''\
+package groovy.transform;
+
+@java.lang.annotation.Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+public @interface AnnotationCollector {
+    String processor() default "org.codehaus.groovy.transform.AnnotationCollectorTransform";
+    Class[] value() default {};
+}
+'''
+
+    doVariantableTest('''\
+import groovy.transform.AnnotationCollector
+
+@interface Bar {
+    int xxx()
+}
+
+@interface Foo {
+    int yyy()
+}
+
+@Foo @Bar
+@AnnotationCollector()
+@interface Alias1 {}
+
+@Alias1(<caret>)
+class Baz {}''', '', CompletionType.BASIC, CompletionResult.contain, 'xxx', 'yyy')
+  }
+
   public void "test honor statistics"() {
     ((StatisticsManagerImpl)StatisticsManager.instance).enableStatistics(testRootDisposable)
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy
index da7c2fb8c1cb..cbef31b9025b 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,14 +72,14 @@ abstract public class GroovyCompletionTestBase extends LightCodeInsightFixtureTe
     final actual = myFixture.lookupElementStrings
     switch (testType) {
       case CompletionResult.contain:
-        assertTrue(actual.containsAll(variants))
+        assertTrue(myFixture.lookupElementStrings as String, actual.containsAll(variants))
         break
       case CompletionResult.equal:
         assertOrderedEquals(actual, variants)
         break
       case CompletionResult.notContain:
         variants.each {
-          assertFalse(actual.contains(it))
+          assertFalse(myFixture.lookupElementStrings as String, actual.contains(it))
         }
     }
   }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/GroovyTransformationsTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/GroovyTransformationsTest.groovy
index 3b025a6ee095..5ab7131f3eb7 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/GroovyTransformationsTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/GroovyTransformationsTest.groovy
@@ -42,7 +42,7 @@ class GroovyTransformationsTest extends LightCodeInsightFixtureTestCase {
 
   public void testCategoryTransform() throws Throwable { doVariantsTest('name', 'getName', 'FileNameByRegexFinder', 'FileNameFinder', 'FilenameFilter', 'IFileNameFinder') }
 
-  public void testMixinTransform() throws Throwable { doVariantsTest('dive', 'findIndexValues', 'findIndexValues') }
+  public void testMixinTransform() throws Throwable { doPlainTest() }
 
   public void testBindableTransform() throws Throwable { doPlainTest() }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/aliasAnnotations/GrAnnotationHighlightingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/aliasAnnotations/GrAnnotationHighlightingTest.groovy
index 91b136bd0f6f..9beb849df765 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/aliasAnnotations/GrAnnotationHighlightingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/aliasAnnotations/GrAnnotationHighlightingTest.groovy
@@ -81,7 +81,7 @@ import groovy.transform.*
 @AnnotationCollector([EqualsAndHashCode, Immutable])
 @interface Alias {}
 
-@<error descr="'@ToString' not applicable to local variable">Alias</error>(excludes = ['a'])
+@<error descr="'@groovy.transform.EqualsAndHashCode' not applicable to local variable"><error descr="'@groovy.transform.Immutable' not applicable to local variable"><error descr="'@groovy.transform.ToString' not applicable to local variable">Alias</error></error></error>(excludes = ['a'])
 int foo
 ''')
   }
@@ -137,6 +137,66 @@ import groovy.transform.*
 class Foo {
     Integer a, b
 }
+''')
+  }
+
+  public void testAnnotationCollectorInterfaceWithAttrs() {
+    testHighlighting('''\
+@interface Foo {
+  int foo()
+}
+
+
+@groovy.transform.AnnotationCollector
+@Foo
+@interface <error descr="Annotation type annotated with @AnnotationCollector cannot have attributes">A</error> {
+  int bar()
+}
+
+@A(foo = 2)
+class X{}
+''')
+  }
+
+  public void testAnnotationCollectorClass() {
+    testHighlighting('''
+@interface Foo {
+  int foo()
+}
+
+@groovy.transform.AnnotationCollector
+@Foo
+class A {
+  int bar() {}
+}
+
+class B{}
+
+@A(foo = 2)
+@<error descr="'B' is not an annotation">B</error>
+class X {}
+''')
+  }
+
+  void testInapplicableAlias2() {
+    testHighlighting('''\
+import groovy.transform.AnnotationCollector
+import groovy.transform.Immutable
+import groovy.transform.ToString
+
+@AnnotationCollector([Immutable, ToString])
+@interface Alias4 {}
+
+@Immutable
+@ToString
+@AnnotationCollector
+@interface Alias5 {}
+
+@<error descr="'@groovy.transform.Immutable' not applicable to method"><error descr="'@groovy.transform.ToString' not applicable to method">Alias4</error></error>
+def aaa() {}
+
+@<error descr="'@groovy.transform.Immutable' not applicable to method"><error descr="'@groovy.transform.ToString' not applicable to method">Alias5</error></error>
+def bbb() {}
 ''')
   }
 }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
index bd64b661cac2..e580466e0d0a 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
@@ -1120,43 +1120,4 @@ print(<error descr="Collection literal contains named and expression arguments a
 ''')
   }
 
-  public void testAnnotationCollectorInterfaceWithAttrs() {
-    testHighlighting('''\
-@interface Foo {
-  int foo()
-}
-
-
-@groovy.transform.AnnotationCollector
-@Foo
-@interface <error descr="Annotation type annotated with @AnnotationCollector cannot have attributes">A</error> {
-  int bar()
-}
-
-@A(foo = 2)
-class X{}
-''')
-  }
-
-  public void testAnnotationCollectorClass() {
-    testHighlighting('''
-@interface Foo {
-  int foo()
-}
-
-@groovy.transform.AnnotationCollector
-@Foo
-class A {
-  int bar() {}
-}
-
-class B{}
-
-@A(foo = 2)
-@<error descr="'B' is not an annotation">B</error>
-class X {}
-''')
-
-
-  }
 }
\ No newline at end of file
diff --git a/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties b/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
index 375ee39ddd23..308d3279e7c6 100644
--- a/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
+++ b/plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
@@ -114,6 +114,7 @@ hg4idea.merge.please-commit=Merged heads, please commit repository \"{0}\"
 hg4idea.error.invalidExecutable=\"{0}\" is not a valid mercurial executable
 hg4idea.integrate.other.head=Other head: {0}
 hg4idea.error.log.command.execution=Error during log command execution
+hg4idea.branches.error.description=Couldn't collect information about branches
 
 hg4idea.dialog.login.password.required=Login and password required
 hg4idea.dialog.login.description=Login to {0}
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java
index 7d978fc5e59f..04c40795f6d9 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Consumer;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -36,7 +35,7 @@ import org.zmlx.hg4idea.ui.HgPushDialog;
 import org.zmlx.hg4idea.util.HgErrorUtil;
 import org.zmlx.hg4idea.util.HgUtil;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Matcher;
@@ -66,7 +65,9 @@ public class HgPusher {
         }
         VirtualFile firstRepo = repositories.get(0);
         final List<HgTagBranch> branches = getBranches(myProject, firstRepo);
-
+        if (branches.isEmpty()) {
+          return;
+        }
         final AtomicReference<HgPushCommand> pushCommand = new AtomicReference<HgPushCommand>();
         UIUtil.invokeAndWaitIfNeeded(new Runnable() {
           @Override
@@ -94,14 +95,13 @@ public class HgPusher {
 
   @NotNull
   public static List<HgTagBranch> getBranches(@NotNull Project project, @NotNull VirtualFile root) {
-    final List<HgTagBranch> branchesList = new ArrayList<HgTagBranch>();
-    new HgTagBranchCommand(project, root).listBranches(new Consumer<List<HgTagBranch>>() {
-      @Override
-      public void consume(final List<HgTagBranch> branches) {
-        branchesList.addAll(branches);
-      }
-    });
-    return branchesList;
+    HgCommandResult branchesResult = new HgTagBranchCommand(project, root).collectBranches();
+    if (branchesResult == null) {
+      new HgCommandResultNotifier(project)
+        .notifyError(branchesResult, "Mercurial command failed", HgVcsMessages.message("hg4idea.branches.error.description"));
+      return Collections.emptyList();
+    }
+    return HgTagBranchCommand.parseResult(branchesResult);
   }
 
   private static void push(final Project project, HgPushCommand command) {
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java
index 1f1be2056375..ede2c660fd8b 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java
@@ -17,6 +17,7 @@ package org.zmlx.hg4idea;
 
 import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
@@ -44,6 +45,7 @@ import java.util.concurrent.atomic.AtomicReference;
 public class HgVFSListener extends VcsVFSListener {
 
   private final VcsDirtyScopeManager dirtyScopeManager;
+  private static final Logger LOG = Logger.getInstance(HgVFSListener.class);
 
   protected HgVFSListener(final Project project, final HgVcs vcs) {
     super(project, vcs);
@@ -96,7 +98,9 @@ public class HgVFSListener extends VcsVFSListener {
           final Collection<VirtualFile> files = e.getValue();
           pi.setText(repo.getPresentableUrl());
           try {
-            untrackedFiles.addAll(new HgStatusCommand(myProject).getHgUntrackedFiles(repo, new ArrayList<VirtualFile>(files)));
+            untrackedFiles
+              .addAll(new HgStatusCommand.Builder(false).includeUnknown(true).build(myProject)
+                        .getHgUntrackedFiles(repo, new ArrayList<VirtualFile>(files)));
           }
           catch (final VcsException ex) {
             UIUtil.invokeLaterIfNeeded(new Runnable() {
@@ -141,21 +145,17 @@ public class HgVFSListener extends VcsVFSListener {
         final ArrayList<VirtualFile> adds = new ArrayList<VirtualFile>();
         final HashMap<VirtualFile, VirtualFile> copies = new HashMap<VirtualFile, VirtualFile>(); // from -> to
         //delete unversioned and ignored files from copy source
-        if (myProject != null) {
-          Collection<VirtualFile> unversionedAndIgnoredFiles = new ArrayList<VirtualFile>();
-          final Map<VirtualFile, Collection<VirtualFile>> sortedSourceFilesByRepos = HgUtil.sortByHgRoots(myProject, copyFromMap.values());
-          HgStatusCommand statusCommand = new HgStatusCommand(myProject);
-          statusCommand.setOnlyUntrackedTrue();
-          statusCommand.setIncludeIgnored(true);
-          for (VirtualFile repo : sortedSourceFilesByRepos.keySet()) {
-            Set<HgChange> changes = statusCommand.execute(repo);
-            for (HgChange change : changes) {
-              unversionedAndIgnoredFiles.add(change.afterFile().toFilePath().getVirtualFile());
-            }
+        LOG.assertTrue(myProject != null, "Project is null");
+        Collection<VirtualFile> unversionedAndIgnoredFiles = new ArrayList<VirtualFile>();
+        final Map<VirtualFile, Collection<VirtualFile>> sortedSourceFilesByRepos = HgUtil.sortByHgRoots(myProject, copyFromMap.values());
+        HgStatusCommand statusCommand = new HgStatusCommand.Builder(false).includeUnknown(true).includeIgnored(true).build(myProject);
+        for (VirtualFile repo : sortedSourceFilesByRepos.keySet()) {
+          Set<HgChange> changes = statusCommand.execute(repo);
+          for (HgChange change : changes) {
+            unversionedAndIgnoredFiles.add(change.afterFile().toFilePath().getVirtualFile());
           }
-          copyFromMap.values().removeAll(unversionedAndIgnoredFiles);
         }
-
+        copyFromMap.values().removeAll(unversionedAndIgnoredFiles);
 
         // separate adds from copies
         for (VirtualFile file : addedFiles) {
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
index 4c986b8f544a..a33f235aaf4b 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
@@ -84,7 +84,6 @@ public class HgVcs extends AbstractVcs<CommittedChangeList> {
   private final HgAnnotationProvider annotationProvider;
   private final HgUpdateEnvironment updateEnvironment;
   private final HgCachingCommitedChangesProvider commitedChangesProvider;
-  protected final @NotNull HgPlatformFacade myPlatformFacade;
   private MessageBusConnection messageBusConnection;
   @NotNull private final HgGlobalSettings globalSettings;
   @NotNull private final HgProjectSettings projectSettings;
@@ -106,7 +105,7 @@ public class HgVcs extends AbstractVcs<CommittedChangeList> {
   public HgVcs(Project project,
                @NotNull HgGlobalSettings globalSettings,
                @NotNull HgProjectSettings projectSettings,
-               ProjectLevelVcsManager vcsManager, @NotNull HgPlatformFacade platformFacade) {
+               ProjectLevelVcsManager vcsManager) {
     super(project, VCS_NAME);
     this.globalSettings = globalSettings;
     this.projectSettings = projectSettings;
@@ -121,7 +120,6 @@ public class HgVcs extends AbstractVcs<CommittedChangeList> {
     commitedChangesProvider = new HgCachingCommitedChangesProvider(project, this);
     myMergeProvider = new HgMergeProvider(myProject);
     myCommitAndPushExecutor = new HgCommitAndPushExecutor(checkinEnvironment);
-    myPlatformFacade = platformFacade;
   }
 
   public String getDisplayName() {
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java
index 83c5e202cd4f..f7951e5b7a28 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgUpdateToAction.java
@@ -53,21 +53,9 @@ public class HgUpdateToAction extends HgAbstractGlobalAction {
     dialog.show();
     if (dialog.isOK()) {
       FileDocumentManager.getInstance().saveAllDocuments();
-      String updateToValue;
-      if (dialog.isBranchSelected() && dialog.getBranch() != null) {
-        updateToValue = dialog.getBranch().getName();
-      }
-      else if (dialog.isTagSelected() && dialog.getTag() != null) {
-        updateToValue = dialog.getTag().getName();
-      }
-      else if (dialog.isRevisionSelected()) {
-        updateToValue = dialog.getRevision();
-      }
-      else {
-        new HgCommandResultNotifier(project).notifyError(null, "Update failed", "Couldn't execute Mercurial command");
-        return;// hg execute command error occurs//
-      }
-
+      String updateToValue = dialog.isBranchSelected()
+                             ? dialog.getBranch().getName()
+                             : dialog.isTagSelected() ? dialog.getTag().getName() : dialog.getRevision();
       new Task.Backgroundable(project, HgVcsMessages.message("action.hg4idea.updateTo.description", updateToValue)) {
 
         @Override
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
index 3d377e9155c6..46957961c0cf 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
@@ -12,7 +12,6 @@
 // limitations under the License.
 package org.zmlx.hg4idea.command;
 
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
@@ -23,7 +22,10 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsFileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.zmlx.hg4idea.*;
+import org.zmlx.hg4idea.HgChange;
+import org.zmlx.hg4idea.HgFile;
+import org.zmlx.hg4idea.HgFileStatusEnum;
+import org.zmlx.hg4idea.HgRevisionNumber;
 import org.zmlx.hg4idea.execution.HgCommandExecutor;
 import org.zmlx.hg4idea.execution.HgCommandResult;
 
@@ -39,59 +41,74 @@ public class HgStatusCommand {
 
   private final Project project;
 
-  private boolean includeAdded = true;
-  private boolean includeModified = true;
-  private boolean includeRemoved = true;
-  private boolean includeDeleted = true;
-  private boolean includeUnknown = true;
-  private boolean includeIgnored = true;
-  private boolean includeCopySource = true;
+  private final boolean includeAdded;
+  private final boolean includeModified;
+  private final boolean includeRemoved;
+  private final boolean includeDeleted;
+  private final boolean includeUnknown;
+  private final boolean includeIgnored;
+  private final boolean includeCopySource;
+
   @Nullable private HgRevisionNumber baseRevision;
   @Nullable private HgRevisionNumber targetRevision;
-  private HgPlatformFacade myPlatformFacade;
 
-  public HgStatusCommand(Project project) {
-    this(project, ServiceManager.getService(project, HgPlatformFacade.class));
+
+  public static class Builder {
+    private boolean includeAdded;
+    private boolean includeModified;
+    private boolean includeRemoved;
+    private boolean includeDeleted;
+    private boolean includeUnknown;
+    private boolean includeIgnored;
+    private boolean includeCopySource;
+
+    public Builder(boolean initValue) {
+      includeAdded = initValue;
+      includeModified = initValue;
+      includeRemoved = initValue;
+      includeDeleted = initValue;
+      includeUnknown = initValue;
+      includeIgnored = initValue;
+      includeCopySource = initValue;
+    }
+
+    public Builder includeUnknown(boolean val) {
+      includeUnknown = val;
+      return this;
+    }
+
+    public Builder includeIgnored(boolean val) {
+      includeIgnored = val;
+      return this;
+    }
+
+    public Builder includeCopySource(boolean val) {
+      includeCopySource = val;
+      return this;
+    }
+
+    public HgStatusCommand build(Project project) {
+      return new HgStatusCommand(project, this);
+    }
+
   }
 
-  public HgStatusCommand(Project project, HgPlatformFacade facade) {
+  private HgStatusCommand(Project project, Builder builder) {
     this.project = project;
-    myPlatformFacade = facade;
-  }
-
-  public void setIncludeAdded(boolean includeAdded) {
-    this.includeAdded = includeAdded;
-  }
-
-  public void setIncludeModified(boolean includeModified) {
-    this.includeModified = includeModified;
-  }
-
-  public void setIncludeRemoved(boolean includeRemoved) {
-    this.includeRemoved = includeRemoved;
-  }
-
-  public void setIncludeDeleted(boolean includeDeleted) {
-    this.includeDeleted = includeDeleted;
-  }
-
-  public void setIncludeUnknown(boolean includeUnknown) {
-    this.includeUnknown = includeUnknown;
-  }
-
-  public void setIncludeIgnored(boolean includeIgnored) {
-    this.includeIgnored = includeIgnored;
-  }
-
-  public void setIncludeCopySource(boolean includeCopySource) {
-    this.includeCopySource = includeCopySource;
+    includeAdded = builder.includeAdded;
+    includeModified = builder.includeModified;
+    includeRemoved = builder.includeRemoved;
+    includeDeleted = builder.includeDeleted;
+    includeUnknown = builder.includeUnknown;
+    includeIgnored = builder.includeIgnored;
+    includeCopySource = builder.includeCopySource;
   }
 
   public void setBaseRevision(@Nullable HgRevisionNumber base) {
     baseRevision = base;
   }
 
-  public void setTargetRevision(HgRevisionNumber target) {
+  public void setTargetRevision(@Nullable HgRevisionNumber target) {
     targetRevision = target;
   }
 
@@ -104,7 +121,7 @@ public class HgStatusCommand {
       return Collections.emptySet();
     }
 
-    HgCommandExecutor executor = new HgCommandExecutor(project, null, myPlatformFacade);
+    HgCommandExecutor executor = new HgCommandExecutor(project, null);
     executor.setSilent(true);
 
     List<String> options = new LinkedList<String>();
@@ -187,20 +204,9 @@ public class HgStatusCommand {
     return changes;
   }
 
-  public void setOnlyUntrackedTrue() {
-    includeAdded = false;
-    includeModified = false;
-    includeRemoved = false;
-    includeDeleted = false;
-    includeCopySource = false;
-    includeIgnored = false;
-    includeUnknown = true;
-  }
-
   @NotNull
   public Collection<VirtualFile> getHgUntrackedFiles(@NotNull VirtualFile repo, @NotNull List<VirtualFile> files) throws VcsException {
     Collection<VirtualFile> untrackedFiles = new HashSet<VirtualFile>();
-    setOnlyUntrackedTrue();
     List<FilePath> filePaths = ObjectsConvertor.vf2fp(files);
     Set<HgChange> change = execute(repo, filePaths);
     for (HgChange hgChange : change) {
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgTagBranchCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgTagBranchCommand.java
index 202428d6adeb..b72897e6afe5 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgTagBranchCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgTagBranchCommand.java
@@ -14,13 +14,11 @@ package org.zmlx.hg4idea.command;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.HgRevisionNumber;
 import org.zmlx.hg4idea.execution.HgCommandExecutor;
 import org.zmlx.hg4idea.execution.HgCommandResult;
-import org.zmlx.hg4idea.execution.HgCommandResultHandler;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -57,29 +55,15 @@ public class HgTagBranchCommand {
     return output.get(0).trim();
   }
 
-  public void listBranches(final Consumer<List<HgTagBranch>> branchListConsumer) {
-    new HgCommandExecutor(project).execute(repo, "branches", null, new HgCommandResultHandler() {
-      @Override
-      public void process(@Nullable HgCommandResult result) {
-        if (result != null) {
-          branchListConsumer.consume(tokenize(result));
-        }
-      }
-    });
+  public HgCommandResult collectBranches() {
+    return new HgCommandExecutor(project).executeInCurrentThread(repo, "branches", null);
   }
 
-  public void listTags(final Consumer<List<HgTagBranch>> tagListConsumer) {
-    new HgCommandExecutor(project).execute(repo, "tags", null, new HgCommandResultHandler() {
-      @Override
-      public void process(@Nullable HgCommandResult result) {
-        if (result != null) {
-          tagListConsumer.consume(tokenize(result));
-        }
-      }
-    });
+  public HgCommandResult collectTags() {
+    return new HgCommandExecutor(project).executeInCurrentThread(repo, "tags", null);
   }
 
-  private static List<HgTagBranch> tokenize(HgCommandResult result) {
+  public static List<HgTagBranch> parseResult(HgCommandResult result) {
     List<HgTagBranch> branches = new LinkedList<HgTagBranch>();
     for (final String line : result.getOutputLines()) {
       Matcher matcher = BRANCH_LINE.matcher(line);
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java
index 4a129488087b..0b039bd048c2 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java
@@ -13,7 +13,6 @@
 package org.zmlx.hg4idea.execution;
 
 import com.intellij.execution.ui.ConsoleViewContentType;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
@@ -23,7 +22,6 @@ import com.intellij.vcsUtil.VcsImplUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.HgGlobalSettings;
-import org.zmlx.hg4idea.HgPlatformFacade;
 import org.zmlx.hg4idea.HgVcs;
 import org.zmlx.hg4idea.HgVcsMessages;
 import org.zmlx.hg4idea.action.HgCommandResultNotifier;
@@ -66,20 +64,14 @@ public final class HgCommandExecutor {
   private boolean myIsSilent = false;
   private boolean myShowOutput = false;
   private List<String> myOptions = DEFAULT_OPTIONS;
-  private HgPlatformFacade myPlatformFacade;
 
   public HgCommandExecutor(Project project) {
-    this(project, null, ServiceManager.getService(project, HgPlatformFacade.class));
+    this(project, null);
   }
 
   public HgCommandExecutor(Project project, @Nullable String destination) {
-    this(project, destination, ServiceManager.getService(project, HgPlatformFacade.class));
-  }
-
-  public HgCommandExecutor(Project project, @Nullable String destination, HgPlatformFacade platformFacade) {
     myProject = project;
-    myPlatformFacade = platformFacade;
-    myVcs = platformFacade.getVcs(project);
+    myVcs = HgVcs.getInstance(project);
     myDestination = destination;
   }
 
@@ -155,9 +147,9 @@ public final class HgCommandExecutor {
     WarningReceiver warningReceiver = new WarningReceiver();
     PassReceiver passReceiver = new PassReceiver(myProject, forceAuthorization);
 
-    SocketServer promptServer = new SocketServer(new PromptReceiver(handler), myPlatformFacade);
-    SocketServer warningServer = new SocketServer(warningReceiver, myPlatformFacade);
-    SocketServer passServer = new SocketServer(passReceiver, myPlatformFacade);
+    SocketServer promptServer = new SocketServer(new PromptReceiver(handler));
+    SocketServer warningServer = new SocketServer(warningReceiver);
+    SocketServer passServer = new SocketServer(passReceiver);
 
     try {
       int promptPort = promptServer.start();
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/SocketServer.java b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/SocketServer.java
index fc8ee0bc5124..453fddfada90 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/SocketServer.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/SocketServer.java
@@ -12,8 +12,8 @@
 // limitations under the License.
 package org.zmlx.hg4idea.execution;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
-import org.zmlx.hg4idea.HgPlatformFacade;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -29,18 +29,16 @@ import java.net.SocketException;
 public class SocketServer {
   protected ServerSocket myServerSocket;
   private final Protocol myProtocol;
-  private HgPlatformFacade myPlatformFacade;
 
-  public SocketServer(Protocol protocol,HgPlatformFacade facade) {
+  public SocketServer(Protocol protocol) {
     myProtocol = protocol;
-    myPlatformFacade = facade;
   }
 
   public int start() throws IOException {
     myServerSocket = new ServerSocket(0);
     int port = myServerSocket.getLocalPort();
 
-    myPlatformFacade.executeOnPooledThread(new Runnable() {
+    ApplicationManager.getApplication().executeOnPooledThread(new Runnable() {
       @Override
       public void run() {
         try {
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java
index 6969deb9f905..371fc70979b5 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java
@@ -83,7 +83,7 @@ public class HgChangeProvider implements ChangeProvider {
       final HgRevisionNumber parentRevision = new HgWorkingCopyRevisionsCommand(myProject).firstParent(repo);
       final Map<HgFile, HgResolveStatusEnum> list = new HgResolveCommand(myProject).getListSynchronously(repo);
 
-      hgChanges.addAll(new HgStatusCommand(myProject).execute(repo, entry.getValue()));
+      hgChanges.addAll(new HgStatusCommand.Builder(true).build(myProject).execute(repo, entry.getValue()));
       sendChanges(builder, hgChanges, list, workingRevision, parentRevision);
     }
     return hgChanges;
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffFromHistoryHandler.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffFromHistoryHandler.java
index b9cf96538e65..7f4c40f9ac5b 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffFromHistoryHandler.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffFromHistoryHandler.java
@@ -16,7 +16,6 @@
 package org.zmlx.hg4idea.provider;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
@@ -36,7 +35,6 @@ import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.HgFileRevision;
-import org.zmlx.hg4idea.HgPlatformFacade;
 import org.zmlx.hg4idea.util.HgUtil;
 
 import java.util.List;
@@ -118,8 +116,7 @@ public class HgDiffFromHistoryHandler implements DiffFromHistoryHandler {
       @Override
       public void run(@NotNull ProgressIndicator indicator) {
         if (myProject != null) {
-          myChanges = HgUtil.getDiff(HgDiffFromHistoryHandler.this.myProject, root, path, rev1, rev2, ServiceManager
-            .getService(myProject, HgPlatformFacade.class));
+          myChanges = HgUtil.getDiff(HgDiffFromHistoryHandler.this.myProject, root, path, rev1, rev2);
         }
       }
 
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/commit/HgCheckinEnvironment.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/commit/HgCheckinEnvironment.java
index dee98d653983..9f04d14e89af 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/commit/HgCheckinEnvironment.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/commit/HgCheckinEnvironment.java
@@ -38,8 +38,6 @@ import org.zmlx.hg4idea.command.*;
 import org.zmlx.hg4idea.execution.HgCommandException;
 
 import java.util.*;
-import java.util.HashMap;
-import java.util.HashSet;
 
 public class HgCheckinEnvironment implements CheckinEnvironment {
 
@@ -136,10 +134,8 @@ public class HgCheckinEnvironment implements CheckinEnvironment {
   private Set<HgFile> getChangedFilesNotInCommit(VirtualFile repo, Set<HgFile> selectedFiles) {
     List<HgRevisionNumber> parents = new HgWorkingCopyRevisionsCommand(myProject).parents(repo);
 
-    HgStatusCommand statusCommand = new HgStatusCommand(myProject);
+    HgStatusCommand statusCommand = new HgStatusCommand.Builder(true).includeUnknown(false).includeIgnored(false).build(myProject);
     statusCommand.setBaseRevision(parents.get(0));
-    statusCommand.setIncludeUnknown(false);
-    statusCommand.setIncludeIgnored(false);
     Set<HgChange> allChangedFilesInRepo = statusCommand.execute(repo);
 
     Set<HgFile> filesNotIncluded = new HashSet<HgFile>();
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java
index 91f06c5f135b..2fdc47e4cadb 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java
@@ -216,9 +216,7 @@ public class HgRegularUpdater implements HgUpdater {
   }
 
   private Set<HgChange> getLocalChanges() {
-    HgStatusCommand statusCommand = new HgStatusCommand(project);
-    statusCommand.setIncludeIgnored(false);
-    statusCommand.setIncludeUnknown(false);
+    HgStatusCommand statusCommand = new HgStatusCommand.Builder(true).includeUnknown(false).includeIgnored(false).build(project);
     return statusCommand.execute(repository);
   }
 
@@ -266,7 +264,7 @@ public class HgRegularUpdater implements HgUpdater {
     if (parentAfterUpdate.equals(parentBeforeUpdate)) { // nothing to update => returning not to capture local uncommitted changes
       return;
     }
-    HgStatusCommand statusCommand = new HgStatusCommand(project);
+    HgStatusCommand statusCommand = new HgStatusCommand.Builder(true).build(project);
     statusCommand.setBaseRevision(parentBeforeUpdate);
     statusCommand.setTargetRevision(parentAfterUpdate);
     Set<HgChange> changes = statusCommand.execute(repo);
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java
index 37c72b6861b7..e2b2a82678a6 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java
@@ -16,7 +16,6 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Consumer;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.HgRevisionNumber;
@@ -25,6 +24,7 @@ import org.zmlx.hg4idea.command.HgHeadsCommand;
 import org.zmlx.hg4idea.command.HgTagBranch;
 import org.zmlx.hg4idea.command.HgTagBranchCommand;
 import org.zmlx.hg4idea.command.HgWorkingCopyRevisionsCommand;
+import org.zmlx.hg4idea.execution.HgCommandResult;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -118,21 +118,18 @@ public class HgMergeDialog extends DialogWrapper {
   }
 
   private void loadBranches(VirtualFile root) {
-    if (branchesForRepos.get(root) != null) {
-      branchSelector.setModel(new DefaultComboBoxModel(branchesForRepos.get(root).toArray()));
-    }
+    assert branchesForRepos.get(root) != null;
+    branchSelector.setModel(new DefaultComboBoxModel(branchesForRepos.get(root).toArray()));
   }
 
   private void loadTags(VirtualFile root) {
-    new HgTagBranchCommand(project, root).listTags(new Consumer<List<HgTagBranch>>() {
+    HgCommandResult tagsResult = new HgTagBranchCommand(project, root).collectTags();
+    assert tagsResult != null;
+    final List<HgTagBranch> tags = HgTagBranchCommand.parseResult(tagsResult);
+    UIUtil.invokeAndWaitIfNeeded(new Runnable() {
       @Override
-      public void consume(final List<HgTagBranch> tags) {
-        UIUtil.invokeAndWaitIfNeeded(new Runnable() {
-          @Override
-          public void run() {
-            tagSelector.setModel(new DefaultComboBoxModel(tags.toArray()));
-          }
-        });
+      public void run() {
+        tagSelector.setModel(new DefaultComboBoxModel(tags.toArray()));
       }
     });
   }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java
index 4f12354a09f9..e3c03be57a5e 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java
@@ -15,10 +15,10 @@ package org.zmlx.hg4idea.ui;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Consumer;
 import com.intellij.util.ui.UIUtil;
 import org.zmlx.hg4idea.command.HgTagBranch;
 import org.zmlx.hg4idea.command.HgTagBranchCommand;
+import org.zmlx.hg4idea.execution.HgCommandResult;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -119,21 +119,18 @@ public class HgUpdateToDialog extends DialogWrapper {
   }
 
   private void loadBranches(VirtualFile root) {
-    if (branchesForRepos.get(root) != null) {
-      branchSelector.setModel(new DefaultComboBoxModel(branchesForRepos.get(root).toArray()));
-    }
+    assert branchesForRepos.get(root) != null;
+    branchSelector.setModel(new DefaultComboBoxModel(branchesForRepos.get(root).toArray()));
   }
 
   private void loadTags(VirtualFile root) {
-    new HgTagBranchCommand(project, root).listTags(new Consumer<List<HgTagBranch>>() {
+    HgCommandResult tagsResult = new HgTagBranchCommand(project, root).collectTags();
+    assert tagsResult != null;
+    final List<HgTagBranch> tags = HgTagBranchCommand.parseResult(tagsResult);
+    UIUtil.invokeAndWaitIfNeeded(new Runnable() {
       @Override
-      public void consume(final List<HgTagBranch> tags) {
-        UIUtil.invokeAndWaitIfNeeded(new Runnable() {
-          @Override
-          public void run() {
-            tagSelector.setModel(new DefaultComboBoxModel(tags.toArray()));
-          }
-        });
+      public void run() {
+        tagSelector.setModel(new DefaultComboBoxModel(tags.toArray()));
       }
     });
   }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUiUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUiUtil.java
index 703637931334..090a9f46178f 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUiUtil.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUiUtil.java
@@ -22,8 +22,11 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NotNull;
+import org.zmlx.hg4idea.HgVcsMessages;
+import org.zmlx.hg4idea.action.HgCommandResultNotifier;
 import org.zmlx.hg4idea.command.HgTagBranch;
 import org.zmlx.hg4idea.command.HgTagBranchCommand;
+import org.zmlx.hg4idea.execution.HgCommandResult;
 
 import java.util.Collection;
 import java.util.List;
@@ -42,15 +45,21 @@ public class HgUiUtil {
       @Override
       public void run(@NotNull ProgressIndicator indicator) {
         for (final VirtualFile repo : repos) {
-          new HgTagBranchCommand(project, repo).listBranches(new Consumer<List<HgTagBranch>>() {
-            @Override
-            public void consume(final List<HgTagBranch> branches) {
-              branchesForRepos.put(repo, branches);
-            }
-          });
+          HgCommandResult result = new HgTagBranchCommand(project, repo).collectBranches();
+          if (result == null) {
+            indicator.cancel();
+            return;
+          }
+          branchesForRepos.put(repo, HgTagBranchCommand.parseResult(result));
         }
       }
 
+      @Override
+      public void onCancel() {
+        new HgCommandResultNotifier(project)
+          .notifyError(null, "Mercurial command failed", HgVcsMessages.message("hg4idea.branches.error.description"));
+      }
+
       @Override
       public void onSuccess() {
         successHandler.consume(branchesForRepos);
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
index ad81451f9dd7..9747fb45904b 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
@@ -285,10 +285,8 @@ public abstract class HgUtil {
 
 
   public static HgFile getFileNameInTargetRevision(Project project, HgRevisionNumber vcsRevisionNumber, HgFile localHgFile) {
-    HgStatusCommand statCommand = new HgStatusCommand(project);
-    statCommand.setIncludeUnknown(false);
+    HgStatusCommand statCommand = new HgStatusCommand.Builder(true).includeUnknown(false).build(project);
     statCommand.setBaseRevision(vcsRevisionNumber);
-    statCommand.setIncludeCopySource(true);
 
     Set<HgChange> changes = statCommand.execute(localHgFile.getRepo());
 
@@ -401,9 +399,8 @@ public abstract class HgUtil {
                                      @NotNull final VirtualFile root,
                                      @NotNull final FilePath path,
                                      @Nullable final HgFileRevision rev1,
-                                     @Nullable final HgFileRevision rev2, HgPlatformFacade facade) {
-    HgStatusCommand statusCommand = new HgStatusCommand(project,facade);
-    statusCommand.setIncludeCopySource(false);
+                                     @Nullable final HgFileRevision rev2) {
+    HgStatusCommand statusCommand = new HgStatusCommand.Builder(true).includeCopySource(false).build(project);
     HgRevisionNumber revNumber1 = null;
     if (rev1 != null) {
       revNumber1 = rev1.getRevisionNumber();
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgLightTest.java b/plugins/hg4idea/testSrc/hg4idea/test/HgLightTest.java
deleted file mode 100644
index 12d7ae31add1..000000000000
--- a/plugins/hg4idea/testSrc/hg4idea/test/HgLightTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package hg4idea.test;
-
-import com.intellij.dvcs.test.MockProject;
-import com.intellij.dvcs.test.MockVirtualFile;
-import com.intellij.openapi.application.PluginPathManager;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.io.FileUtil;
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.File;
-import java.io.IOException;
-
-import static com.intellij.dvcs.test.Executor.*;
-import static hg4idea.test.HgExecutor.hg;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-
-/**
- * @author Nadya Zabrodina
- */
-public class HgLightTest {
-
-  //private static final String USER_NAME = "John Doe";
-  //private static final String USER_EMAIL = "John.Doe@example.com";
-
-  /**
-   * The file system root of test files.
-   * Automatically deleted on {@link #tearDown()}.
-   * Tests should create new files only inside this directory.
-   */
-  protected String myTestRoot;
-
-  /**
-   * The file system root of the project. All project should locate inside this directory.
-   */
-  protected String myProjectRoot;
-
-  protected MockProject myProject;
-  protected HgTestPlatformFacade myPlatformFacade;
-
-  @Before
-  public void setUp() {
-    assumeTrue(false);
-    try {
-      myTestRoot = FileUtil.createTempDirectory("", "").getPath();
-    }
-    catch (IOException e) {
-      fail("Can not start test case!\n");  //todo change
-    }
-    cd(myTestRoot);
-    myProjectRoot = mkdir("project");
-    myProject = new MockProject(myProjectRoot);
-    myPlatformFacade = new HgTestPlatformFacade();
-    cd(".hg");
-    File pluginRoot = new File(PluginPathManager.getPluginHomePath("hg4idea"));
-    String pathToHgrc = "testData\\repo\\dot_hg";
-    File hgrcFile = new File(new File(pluginRoot, FileUtil.toSystemIndependentName(pathToHgrc)), "hgrc");
-    File hgrc = new File(new File(myProjectRoot, ".hg"), "hgrc");
-    try {
-      FileUtil.copy(hgrcFile, hgrc);
-    }
-    catch (IOException e) {
-      e.printStackTrace();
-      fail("Can not copy hgrc file.");
-    }
-    assertTrue(hgrc.exists());
-  }
-
-
-  @After
-  public void tearDown() {
-    if (myTestRoot != null) {
-      FileUtil.delete(new File(myTestRoot));
-    }
-    if (myProject != null) {
-      Disposer.dispose(myProject);
-    }
-  }
-
-  protected MockVirtualFile createRepository(String rootDir) {
-    initRepo(rootDir);
-    return new MockVirtualFile(rootDir);
-  }
-
-  private static void initRepo(String repoRoot) {
-    cd(repoRoot);
-    hg("init");
-    touch("file.txt");
-    hg("add file.txt");
-    hg("commit -m initial");
-  }
-}
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgMockVcs.java b/plugins/hg4idea/testSrc/hg4idea/test/HgMockVcs.java
deleted file mode 100644
index cac1ddda0967..000000000000
--- a/plugins/hg4idea/testSrc/hg4idea/test/HgMockVcs.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package hg4idea.test;
-
-import com.intellij.openapi.options.Configurable;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vcs.ProjectLevelVcsManager;
-import org.zmlx.hg4idea.HgGlobalSettings;
-import org.zmlx.hg4idea.HgProjectSettings;
-import org.zmlx.hg4idea.HgVcs;
-
-/**
- * @author Nadya Zabrodina
- */
-class HgMockVcs extends HgVcs {
-
-  public HgMockVcs(Project project, HgGlobalSettings globalSettings,
-                   HgProjectSettings projectSettings,
-                   ProjectLevelVcsManager vcsManager) {
-    super(project, globalSettings, projectSettings, vcsManager, new HgTestPlatformFacade());
-  }
-
-  @Override
-  public String getDisplayName() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Configurable getConfigurable() {
-    throw new UnsupportedOperationException();
-  }
-}
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgMockVcsManager.java b/plugins/hg4idea/testSrc/hg4idea/test/HgMockVcsManager.java
deleted file mode 100644
index c1a80b9b86af..000000000000
--- a/plugins/hg4idea/testSrc/hg4idea/test/HgMockVcsManager.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package hg4idea.test;
-
-import com.intellij.dvcs.test.MockVirtualFile;
-import com.intellij.openapi.editor.markup.TextAttributes;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vcs.*;
-import com.intellij.openapi.vcs.changes.VcsAnnotationLocalChangesListener;
-import com.intellij.openapi.vcs.history.VcsHistoryCache;
-import com.intellij.openapi.vcs.impl.ContentRevisionCache;
-import com.intellij.openapi.vcs.impl.VcsDescriptor;
-import com.intellij.openapi.vcs.impl.VcsEnvironmentsProxyCreator;
-import com.intellij.openapi.vcs.update.UpdatedFiles;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Processor;
-import org.jetbrains.annotations.NotNull;
-import org.zmlx.hg4idea.HgPlatformFacade;
-import org.zmlx.hg4idea.HgVcs;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author Nadya Zabrodina
- */
-public class HgMockVcsManager extends ProjectLevelVcsManager {
-
-  Project myProject;
-  HgPlatformFacade myPlatformFacade;
-  Collection<String> myRoots = new ArrayList<String>();
-  boolean myProjectRootMapping = false;
-
-  HgMockVcsManager(Project project, HgPlatformFacade facade) {
-    myProject = project;
-    myPlatformFacade = facade;
-  }
-
-  public void addRoots(String... roots) {
-    myRoots.addAll(Arrays.asList(roots));
-  }
-
-  public void setProjectRootMapping() {
-    myProjectRootMapping = true;
-  }
-
-  @Override
-  public VirtualFile[] getRootsUnderVcs(AbstractVcs vcs) {
-
-    List<VirtualFile> roots = new ArrayList<VirtualFile>();
-    for (String root : myRoots) {
-      roots.add(new MockVirtualFile(root));
-    }
-    roots.addAll(Arrays.asList(myPlatformFacade.getProjectRootManager(myProject).getContentRoots()));
-    return roots.toArray(new VirtualFile[0]);
-  }
-
-  @Override
-  public List<VcsDirectoryMapping> getDirectoryMappings() {
-    List<VcsDirectoryMapping> roots = new ArrayList<VcsDirectoryMapping>();
-    for (String root : myRoots) {
-      roots.add(new VcsDirectoryMapping(root, HgVcs.VCS_NAME));
-    }
-
-    if (myProjectRootMapping) {
-      roots.add(new VcsDirectoryMapping("", HgVcs.VCS_NAME));
-    }
-    return roots;
-  }
-
-  @Override
-  public List<VcsDirectoryMapping> getDirectoryMappings(AbstractVcs vcs) {
-    return getDirectoryMappings();
-  }
-
-  @Override
-  public void setDirectoryMappings(List<VcsDirectoryMapping> items) {
-    for (VcsDirectoryMapping item : items) {
-      myRoots.add(item.getDirectory());
-    }
-  }
-
-  @Override
-  public void iterateVfUnderVcsRoot(VirtualFile file, Processor<VirtualFile> processor) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public VcsAnnotationLocalChangesListener getAnnotationLocalChangesListener() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public VcsDescriptor[] getAllVcss() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public AbstractVcs findVcsByName(String name) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public VcsDescriptor getDescriptor(String name) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean checkAllFilesAreUnder(AbstractVcs abstractVcs, VirtualFile[] files) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public AbstractVcs getVcsFor(@NotNull VirtualFile file) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public AbstractVcs getVcsFor(FilePath file) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public VirtualFile getVcsRootFor(VirtualFile file) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public VirtualFile getVcsRootFor(FilePath file) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public VcsRoot getVcsRootObjectFor(VirtualFile file) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public VcsRoot getVcsRootObjectFor(FilePath file) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean checkVcsIsActive(AbstractVcs vcs) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean checkVcsIsActive(String vcsName) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public AbstractVcs[] getAllActiveVcss() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean hasActiveVcss() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean hasAnyMappings() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void addMessageToConsoleWindow(String message, TextAttributes attributes) {
-    throw new UnsupportedOperationException();
-  }
-
-  @NotNull
-  @Override
-  public VcsShowSettingOption getStandardOption(@NotNull VcsConfiguration.StandardOption option, @NotNull AbstractVcs vcs) {
-    throw new UnsupportedOperationException();
-  }
-
-  @NotNull
-  @Override
-  public VcsShowConfirmationOption getStandardConfirmation(@NotNull VcsConfiguration.StandardConfirmation option, AbstractVcs vcs) {
-    throw new UnsupportedOperationException();
-  }
-
-  @NotNull
-  @Override
-  public VcsShowSettingOption getOrCreateCustomOption(@NotNull String vcsActionName, @NotNull AbstractVcs vcs) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void showProjectOperationInfo(UpdatedFiles updatedFiles, String displayActionName) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void addVcsListener(VcsListener listener) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void removeVcsListener(VcsListener listener) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void startBackgroundVcsOperation() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void stopBackgroundVcsOperation() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean isBackgroundVcsOperationRunning() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public List<VirtualFile> getRootsUnderVcsWithoutFiltering(AbstractVcs vcs) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public List<VirtualFile> getDetailedVcsMappings(AbstractVcs vcs) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public VirtualFile[] getAllVersionedRoots() {
-    throw new UnsupportedOperationException();
-  }
-
-  @NotNull
-  @Override
-  public VcsRoot[] getAllVcsRoots() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void updateActiveVcss() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public VcsDirectoryMapping getDirectoryMappingFor(FilePath path) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void setDirectoryMapping(String path, String activeVcsName) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void iterateVcsRoot(VirtualFile root, Processor<FilePath> iterator) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void iterateVcsRoot(VirtualFile root, Processor<FilePath> iterator, com.intellij.openapi.vcs.VirtualFileFilter directoryFilter) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public AbstractVcs findVersioningVcs(VirtualFile file) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public CheckoutProvider.Listener getCompositeCheckoutListener() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public VcsEventsListenerManager getVcsEventsListenerManager() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  protected VcsEnvironmentsProxyCreator getProxyCreator() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public VcsHistoryCache getVcsHistoryCache() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ContentRevisionCache getContentRevisionCache() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean isFileInContent(VirtualFile vf) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean dvcsUsedInProject() {
-    throw new UnsupportedOperationException();
-  }
-}
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java
new file mode 100644
index 000000000000..af5cad92bb72
--- /dev/null
+++ b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package hg4idea.test;
+
+import com.intellij.openapi.application.PluginPathManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.testFramework.LightPlatformTestCase;
+
+import java.io.File;
+import java.io.IOException;
+
+import static com.intellij.dvcs.test.Executor.cd;
+import static com.intellij.dvcs.test.Executor.touch;
+import static hg4idea.test.HgExecutor.hg;
+
+/**
+ * The base class for tests of hg4idea plugin.<br/>
+ * Extend this test to write a test on Mercurial which has the following features/limitations:
+ * <ul>
+ *   <li>This is a {@link LightPlatformTestCase}, which means that IDEA [almost] production platform is set up before the test starts.</li>
+ *   <li>Project base directory is the root of everything. It can contain as much nested repositories as needed,
+ *       but if you need to test the case when hg repository is <b>above</b> the project dir, you need either to adjust this base class,
+ *       or create another one.</li>
+ *   <li>Initially one repository is created with the project dir as its root. I. e. all project is under Mercurial.</li>
+ * </ul>
+ *
+ * @author Kirill Likhodedov
+ */
+public abstract class HgPlatformTest extends LightPlatformTestCase {
+
+  protected Project myProject;
+  protected VirtualFile myProjectRoot;
+  protected VirtualFile myRepository;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+
+    myProject = getProject();
+    myProjectRoot = myProject.getBaseDir();
+
+    createRepository(myProjectRoot);
+    myRepository = myProjectRoot;
+    setUpHgrc(myRepository);
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    super.tearDown();
+  }
+
+  private static void setUpHgrc(VirtualFile repository) {
+    cd(".hg");
+    File pluginRoot = new File(PluginPathManager.getPluginHomePath("hg4idea"));
+    String pathToHgrc = "testData\\repo\\dot_hg";
+    File hgrcFile = new File(new File(pluginRoot, FileUtil.toSystemIndependentName(pathToHgrc)), "hgrc");
+    File hgrc = new File(new File(repository.getPath(), ".hg"), "hgrc");
+    try {
+      FileUtil.copy(hgrcFile, hgrc);
+    }
+    catch (IOException e) {
+      e.printStackTrace();
+      fail("Can not copy hgrc file.");
+    }
+    assertTrue(hgrc.exists());
+  }
+
+  protected void createRepository(VirtualFile root) {
+    initRepo(root.getPath());
+  }
+
+  private static void initRepo(String repoRoot) {
+    cd(repoRoot);
+    hg("init");
+    touch("file.txt");
+    hg("add file.txt");
+    hg("commit -m initial");
+  }
+
+}
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgTestPlatformFacade.java b/plugins/hg4idea/testSrc/hg4idea/test/HgTestPlatformFacade.java
deleted file mode 100644
index 7c21b0f638cc..000000000000
--- a/plugins/hg4idea/testSrc/hg4idea/test/HgTestPlatformFacade.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package hg4idea.test;
-
-import com.intellij.dvcs.test.DvcsTestPlatformFacade;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.vcs.ProjectLevelVcsManager;
-import org.jetbrains.annotations.NotNull;
-import org.zmlx.hg4idea.HgGlobalSettings;
-import org.zmlx.hg4idea.HgPlatformFacade;
-import org.zmlx.hg4idea.HgProjectSettings;
-import org.zmlx.hg4idea.HgVcs;
-
-/**
- * @author Nadya Zabrodina
- */
-public class HgTestPlatformFacade extends DvcsTestPlatformFacade implements HgPlatformFacade {
-  private HgMockVcs myVcs;
-  private HgMockVcsManager myVcsManager;
-
-  @NotNull
-  @Override
-  public HgVcs getVcs(@NotNull Project project) {
-    if (myVcs == null) {
-      HgGlobalSettings globalSettings = new HgGlobalSettings();
-      myVcs = new HgMockVcs(project, globalSettings, new HgProjectSettings(globalSettings), new HgMockVcsManager(project, this));
-    }
-    return myVcs;
-  }
-
-
-  @NotNull
-  @Override
-  public ProjectLevelVcsManager getVcsManager(@NotNull Project project) {
-    if (myVcsManager == null) {
-      myVcsManager = new HgMockVcsManager(project, this);
-    }
-    return myVcsManager;
-  }
-
-
-  @Override
-  public void showDialog(@NotNull DialogWrapper dialog) {
-    throw new UnsupportedOperationException();
-  }
-}
-
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/diff/HgGetDiffForDirTest.java b/plugins/hg4idea/testSrc/hg4idea/test/diff/HgGetDiffForDirTest.java
index 9db9a21637b6..19b3b8871477 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/diff/HgGetDiffForDirTest.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/diff/HgGetDiffForDirTest.java
@@ -15,12 +15,10 @@
  */
 package hg4idea.test.diff;
 
-import com.intellij.dvcs.test.MockVirtualFile;
 import com.intellij.openapi.vcs.FilePath;
+import com.intellij.openapi.vcs.FilePathImpl;
 import com.intellij.openapi.vcs.changes.Change;
-import hg4idea.test.HgLightTest;
-import org.junit.After;
-import org.junit.Test;
+import hg4idea.test.HgPlatformTest;
 import org.zmlx.hg4idea.HgFile;
 import org.zmlx.hg4idea.HgFileRevision;
 import org.zmlx.hg4idea.HgRevisionNumber;
@@ -30,44 +28,28 @@ import java.io.File;
 import java.util.List;
 
 import static hg4idea.test.HgExecutor.*;
-import static junit.framework.Assert.assertEquals;
 
 /**
  * @author Nadya Zabrodina
  */
+public class HgGetDiffForDirTest extends HgPlatformTest {
 
-public class HgGetDiffForDirTest extends HgLightTest {
-  private final String SHORT_TEMPLATE_REVISION = "{rev}:{node|short}";
-  MockVirtualFile myRepository;
+  private static final String SHORT_TEMPLATE_REVISION = "{rev}:{node|short}";
 
-
-  @Override
-  public void setUp() {
-    super.setUp();
-    myRepository = createRepository(myProjectRoot);
-  }
-
-  @After
-  public void tearDown() {
-    super.tearDown();
-  }
-
-  @Test
   public void testDiffForDir() {
-    cd(myProjectRoot);
+    cd(myRepository);
     touch("A.txt", "dsfdfdsf");
     hg("add A.txt");
     touch("B.txt");
     hg("add B.txt");
     hg("commit -m 2files_added");
-    mkdir("dir");
+    File dirFile = new File(mkdir("dir"));
     cd("dir");
     touch("C.txt");
     touch("D.txt");
     hg("add C.txt");
     hg("add D.txt");
     hg("commit -m createDir");
-    File dirFile = new File(myProjectRoot, "dir");
     String[] hash1 = hg("log -l 1 --template=" + SHORT_TEMPLATE_REVISION).split(":");
     HgRevisionNumber r1number = HgRevisionNumber.getInstance(hash1[0], hash1[1]);
     HgFileRevision rev1 =
@@ -79,8 +61,8 @@ public class HgGetDiffForDirTest extends HgLightTest {
     HgRevisionNumber r2number = HgRevisionNumber.getInstance(hash2[0], hash2[1]);
     HgFileRevision rev2 =
       new HgFileRevision(myProject, new HgFile(myRepository, dirFile), r2number, "", null, "", "", null, null, null, null);
-    FilePath dirPath = new com.intellij.openapi.vcs.FilePathImpl(dirFile, dirFile.isDirectory());
-    List<Change> changes = HgUtil.getDiff(myProject, myRepository, dirPath, rev1, rev2, myPlatformFacade);
+    FilePath dirPath = new FilePathImpl(dirFile, true);
+    List<Change> changes = HgUtil.getDiff(myProject, myRepository, dirPath, rev1, rev2);
     assertEquals(changes.size(), 2);
   }
 }
diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUpdateTest.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUpdateTest.java
index 7ba973ef84ff..4c00183d22d8 100644
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUpdateTest.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgUpdateTest.java
@@ -23,14 +23,7 @@ import org.zmlx.hg4idea.HgChange;
 import org.zmlx.hg4idea.HgFile;
 import org.zmlx.hg4idea.HgFileStatusEnum;
 import org.zmlx.hg4idea.HgRevisionNumber;
-import org.zmlx.hg4idea.command.HgHeadsCommand;
-import org.zmlx.hg4idea.command.HgIncomingCommand;
-import org.zmlx.hg4idea.command.HgParentsCommand;
-import org.zmlx.hg4idea.command.HgPullCommand;
-import org.zmlx.hg4idea.command.HgShowConfigCommand;
-import org.zmlx.hg4idea.command.HgStatusCommand;
-import org.zmlx.hg4idea.command.HgUpdateCommand;
-import org.zmlx.hg4idea.command.HgWorkingCopyRevisionsCommand;
+import org.zmlx.hg4idea.command.*;
 import org.zmlx.hg4idea.provider.update.HgRegularUpdater;
 
 import java.io.File;
@@ -40,11 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
 
 @SuppressWarnings({"ConstantConditions", "ThrowableResultOfMethodCallIgnored"})
 public class HgUpdateTest extends HgCollaborativeTest {
@@ -179,7 +168,7 @@ public class HgUpdateTest extends HgCollaborativeTest {
   }
 
   private void assertIsChanged(HgFileStatusEnum status, String... filepath) {
-    Set<HgChange> localChanges = new HgStatusCommand(myProject).execute(projectRepoVirtualFile);
+    Set<HgChange> localChanges = new HgStatusCommand.Builder(true).build(myProject).execute(projectRepoVirtualFile);
     assertTrue(localChanges.contains(new HgChange(getHgFile(filepath), status)));
   }
 
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
index 666f905be3a2..f66c68429f01 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
@@ -20,9 +20,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.XmlPathReferenceInspection;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.htmlInspections.RequiredAttributesInspection;
 import com.intellij.openapi.application.PluginPathManager;
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiField;
-import com.intellij.psi.PsiReference;
+import com.intellij.psi.*;
 import com.intellij.psi.search.ProjectScope;
 import com.intellij.testFramework.PsiTestUtil;
 import com.intellij.util.ArrayUtil;
@@ -144,6 +142,18 @@ public class JavaFXHighlightingTest extends DaemonAnalyzerTestCase {
     assertEquals(resultField, reference.resolve());
   }
 
+  public void testNavigationFromMainToFxml() throws Exception {
+    configureByFiles(null, getTestName(false) + ".java", getTestName(true) + ".fxml");
+    final int offset = myEditor.getCaretModel().getOffset();
+    final PsiReference reference = myFile.findReferenceAt(offset);
+    assertNotNull(reference);
+    final PsiElement resolve = reference.resolve();
+    assertNotNull(resolve);
+    final PsiFile containingFile = resolve.getContainingFile();
+    assertNotNull(containingFile);
+    assertEquals(getTestName(true) + ".fxml", containingFile.getName());
+  }
+
   public void testSourceAttrRecognition() throws Exception {
     doTest();
   }
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXOptimizeImportsTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXOptimizeImportsTest.java
new file mode 100644
index 000000000000..b3726abc3a14
--- /dev/null
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXOptimizeImportsTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.javaFX.fxml;
+
+import com.intellij.codeInsight.actions.OptimizeImportsProcessor;
+import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
+import com.intellij.openapi.application.PluginPathManager;
+import com.intellij.testFramework.PsiTestUtil;
+import org.jetbrains.annotations.NotNull;
+
+public class JavaFXOptimizeImportsTest extends DaemonAnalyzerTestCase {
+  @Override
+  protected void setUpModule() {
+    super.setUpModule();
+    PsiTestUtil.addLibrary(getModule(), "javafx", PluginPathManager.getPluginHomePath("javaFX") + "/testData", "jfxrt.jar");
+  }
+
+  public void testCollapseOnDemand() throws Exception {
+    doTest();
+  }
+
+  public void testRemoveUnused() throws Exception {
+    doTest();
+  }
+
+  private void doTest() throws Exception {
+    configureByFile(getTestName(true) + ".fxml");
+    new OptimizeImportsProcessor(getProject(), getFile()).run();
+    checkResultByFile(getTestName(true) + "_after.fxml");
+  }
+
+  @NotNull
+  @Override
+  protected String getTestDataPath() {
+    return PluginPathManager.getPluginHomePath("javaFX") + "/testData/optimizeImports/";
+  }
+}
diff --git a/plugins/javaFX/javaFX.iml b/plugins/javaFX/javaFX.iml
index 62b68b155832..2a8f125eb754 100644
--- a/plugins/javaFX/javaFX.iml
+++ b/plugins/javaFX/javaFX.iml
@@ -17,6 +17,7 @@
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="java-indexing-api" />
+    <orderEntry type="module" module-name="openapi" />
   </component>
 </module>
 
diff --git a/plugins/javaFX/src/META-INF/common-javaFX-plugin.xml b/plugins/javaFX/src/META-INF/common-javaFX-plugin.xml
index 9c750c058946..c1e8699fea9b 100644
--- a/plugins/javaFX/src/META-INF/common-javaFX-plugin.xml
+++ b/plugins/javaFX/src/META-INF/common-javaFX-plugin.xml
@@ -24,6 +24,8 @@
       <className>org.jetbrains.plugins.javaFX.fxml.codeInsight.intentions.JavaFxCollapseSubTagToAttributeIntention</className>
       <category>JavaFX</category>
     </intentionAction>
+    <xml.importOptimizer implementation="org.jetbrains.plugins.javaFX.fxml.codeInsight.JavaFxImportsOptimizer"/>
+    <psi.referenceContributor implementation="org.jetbrains.plugins.javaFX.fxml.refs.JavaFxReferencesContributor"/>
   </extensions>
 
   <actions>
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxSettingsConfigurable.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxSettingsConfigurable.java
index 57c1e00f4e34..8ad083de7820 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxSettingsConfigurable.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxSettingsConfigurable.java
@@ -15,6 +15,7 @@
  */
 package org.jetbrains.plugins.javaFX;
 
+import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
@@ -93,14 +94,20 @@ public class JavaFxSettingsConfigurable implements SearchableConfigurable, Confi
     return null;
   }
 
+  public static FileChooserDescriptor createSceneBuilderDescriptor() {
+    final FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor();
+    descriptor.setTitle("SceneBuilder Configuration");
+    descriptor.setDescription("Select path to SceneBuilder executable");
+    return descriptor;
+  }
 
   public static class JavaFxConfigurablePanel {
     private TextFieldWithBrowseButton myPathField;
     private JPanel myWholePanel;
 
     public JavaFxConfigurablePanel() {
-      myPathField.addBrowseFolderListener("SceneBuilder Configuration", "Select path to SceneBuilder executable", null,
-                                          FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor());
+      final FileChooserDescriptor descriptor = createSceneBuilderDescriptor();
+      myPathField.addBrowseFolderListener(descriptor.getTitle(), descriptor.getDescription(), null, descriptor);
     }
 
     private void reset(JavaFxSettings settings) {
@@ -111,7 +118,7 @@ public class JavaFxSettingsConfigurable implements SearchableConfigurable, Confi
     }
 
     private void apply(JavaFxSettings settings) {
-      settings.setPathToSceneBuilder(FileUtil.toSystemIndependentName(myPathField.getText()));
+      settings.setPathToSceneBuilder(FileUtil.toSystemIndependentName(myPathField.getText().trim()));
     }
 
     private boolean isModified(JavaFxSettings settings) {
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/actions/OpenInSceneBuilderAction.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/actions/OpenInSceneBuilderAction.java
index f0e21bcf3c67..c342891ae51b 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/actions/OpenInSceneBuilderAction.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/actions/OpenInSceneBuilderAction.java
@@ -23,12 +23,14 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.plugins.javaFX.JavaFxSettings;
+import org.jetbrains.plugins.javaFX.JavaFxSettingsConfigurable;
 import org.jetbrains.plugins.javaFX.fxml.JavaFxFileTypeFactory;
 
 /**
@@ -44,8 +46,16 @@ public class OpenInSceneBuilderAction extends AnAction {
     LOG.assertTrue(virtualFile != null);
     final String path = virtualFile.getPath();
 
-    String pathToSceneBuilder = JavaFxSettings.getInstance().getPathToSceneBuilder();
-    LOG.assertTrue(pathToSceneBuilder != null);
+    final JavaFxSettings settings = JavaFxSettings.getInstance();
+    String pathToSceneBuilder = settings.getPathToSceneBuilder();
+    if (StringUtil.isEmptyOrSpaces(settings.getPathToSceneBuilder())){
+      final VirtualFile sceneBuilderFile = FileChooser.chooseFile(JavaFxSettingsConfigurable.createSceneBuilderDescriptor(), e.getProject(), null);
+      if (sceneBuilderFile == null) return;
+
+      pathToSceneBuilder = sceneBuilderFile.getPath();
+      settings.setPathToSceneBuilder(FileUtil.toSystemIndependentName(pathToSceneBuilder));
+    }
+
     if (SystemInfo.isMac) {
       pathToSceneBuilder += "/Contents/MacOS/JavaAppLauncher";
     }
@@ -68,8 +78,8 @@ public class OpenInSceneBuilderAction extends AnAction {
     presentation.setVisible(false);
     final VirtualFile virtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE);
     if (virtualFile != null && 
-        JavaFxFileTypeFactory.isFxml(virtualFile) && 
-        !StringUtil.isEmptyOrSpaces(JavaFxSettings.getInstance().getPathToSceneBuilder())) {
+        JavaFxFileTypeFactory.isFxml(virtualFile) &&
+        e.getProject() != null) {
       presentation.setEnabled(true);
       presentation.setVisible(true);
     }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxCommonClassNames.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxCommonClassNames.java
index db043d8ea2f7..73e2d9af1850 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxCommonClassNames.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxCommonClassNames.java
@@ -34,4 +34,5 @@ public class JavaFxCommonClassNames {
   @NonNls public static final String JAVAFX_FXML_BUILDER = "javafx.util.Builder";
   @NonNls public static final String JAVAFX_BEANS_OBSERVABLE = "javafx.beans.Observable";
   @NonNls public static final String VALUE_OF = "valueOf";
+  @NonNls public static final String JAVAFX_FXML_FXMLLOADER = "javafx.fxml.FXMLLoader";
 }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxImportsOptimizer.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxImportsOptimizer.java
new file mode 100644
index 000000000000..fcffd00395d0
--- /dev/null
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxImportsOptimizer.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.javaFX.fxml.codeInsight;
+
+import com.intellij.injected.editor.VirtualFileWindow;
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.ImportOptimizer;
+import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ProjectRootManager;
+import com.intellij.openapi.util.EmptyRunnable;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.*;
+import com.intellij.psi.codeStyle.CodeStyleSettings;
+import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
+import com.intellij.psi.impl.source.codeStyle.ImportHelper;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.xml.*;
+import com.intellij.util.containers.HashSet;
+import com.intellij.xml.XmlElementDescriptor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.javaFX.fxml.JavaFxFileTypeFactory;
+import org.jetbrains.plugins.javaFX.fxml.descriptors.JavaFxClassBackedElementDescriptor;
+
+import java.util.*;
+
+/**
+ * User: anna
+ * Date: 2/22/13
+ */
+public class JavaFxImportsOptimizer implements ImportOptimizer {
+  @Override
+  public boolean supports(PsiFile file) {
+    return JavaFxFileTypeFactory.isFxml(file);
+  }
+
+  @NotNull
+  @Override
+  public Runnable processFile(final PsiFile file) {
+    VirtualFile vFile = file.getVirtualFile();
+    if (vFile instanceof VirtualFileWindow) vFile = ((VirtualFileWindow)vFile).getDelegate();
+    final Project project = file.getProject();
+    if (vFile == null || !ProjectRootManager.getInstance(project).getFileIndex().isInSourceContent(vFile)) {
+      return EmptyRunnable.INSTANCE;
+    }
+    final List<Pair<String, Boolean>> names = new ArrayList<Pair<String, Boolean>>();
+    collectNamesToImport(names, (XmlFile)file);
+    Collections.sort(names, new Comparator<Pair<String, Boolean>>() {
+      @Override
+      public int compare(Pair<String, Boolean> o1, Pair<String, Boolean> o2) {
+        return StringUtil.compare(o1.first, o2.first, true);
+      }
+    });
+    final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(project);
+    final List<Pair<String, Boolean>> sortedNames = ImportHelper.sortItemsAccordingToSettings(names, settings);
+    final HashSet<String> onDemand = new HashSet<String>();
+    ImportHelper.collectOnDemandImports(sortedNames, onDemand, settings);
+    final Set<String> importedOnDemand = new HashSet<String>();
+    final List<String> imports = new ArrayList<String>();
+    for (Pair<String, Boolean> pair : sortedNames) {
+      final String qName = pair.first;
+      final String packageName = StringUtil.getPackageName(qName);
+      if (importedOnDemand.contains(packageName)) {
+        continue;
+      }
+      if (onDemand.contains(packageName)) {
+        importedOnDemand.add(packageName);
+        imports.add("<?import " + packageName + ".*?>");
+      } else {
+        imports.add("<?import " + qName + "?>");
+      }
+    }
+    final PsiFileFactory factory = PsiFileFactory.getInstance(file.getProject());
+    
+    final XmlFile dummyFile = (XmlFile)factory.createFileFromText("_Dummy_.fxml", StdFileTypes.XML, StringUtil.join(imports, "\n"));
+    final XmlDocument document = dummyFile.getDocument();
+    final XmlProlog newImportList = document.getProlog();
+    if (newImportList == null) return EmptyRunnable.getInstance();
+    return new Runnable() {
+      @Override
+      public void run() {
+        final XmlDocument xmlDocument = ((XmlFile)file).getDocument();
+        final XmlProlog prolog = xmlDocument.getProlog();
+        if (prolog != null) {
+          final Collection<XmlProcessingInstruction> instructions = PsiTreeUtil.findChildrenOfType(prolog, XmlProcessingInstruction.class);
+          for (final XmlProcessingInstruction instruction : instructions) {
+            final ASTNode node = instruction.getNode();
+            final ASTNode nameNode = node.findChildByType(XmlTokenType.XML_NAME);
+            if (nameNode != null && nameNode.getText().equals("import")) {
+              instruction.delete();
+            }
+          }
+          prolog.add(newImportList);
+        } else {
+          document.addBefore(newImportList, document.getRootTag());
+        }
+      }
+    };
+  }
+  
+  private static void collectNamesToImport(@NotNull final Collection<Pair<String, Boolean>> names, XmlFile file) {
+    file.accept(new XmlRecursiveElementVisitor(){
+      @Override
+      public void visitXmlProlog(XmlProlog prolog) {}
+
+      @Override
+      public void visitXmlProcessingInstruction(XmlProcessingInstruction processingInstruction) {}
+
+      @Override
+      public void visitXmlAttribute(XmlAttribute attribute) {}
+
+      @Override
+      public void visitXmlTag(XmlTag tag) {
+        super.visitXmlTag(tag);
+        final XmlElementDescriptor descriptor = tag.getDescriptor();
+        if (descriptor instanceof JavaFxClassBackedElementDescriptor) {
+          final PsiElement declaration = descriptor.getDeclaration();
+          if (declaration instanceof PsiClass) {
+            names.add(Pair.create(((PsiClass)declaration).getQualifiedName(), false));
+          }
+        }
+      }
+
+      
+    });
+  } 
+}
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java
index 867c6d760df7..9da83e9eee7a 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxAnnotator.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.plugins.javaFX.fxml.refs;
 
-import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.intention.AddAnnotationFix;
 import com.intellij.codeInsight.intentions.XmlChooseColorIntentionAction;
 import com.intellij.lang.annotation.Annotation;
@@ -32,12 +31,10 @@ import com.intellij.psi.presentation.java.SymbolPresentationUtil;
 import com.intellij.psi.util.InheritanceUtil;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.psi.xml.XmlTag;
 import com.intellij.ui.ColorUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.ui.ColorIcon;
 import com.intellij.xml.XmlAttributeDescriptor;
-import com.intellij.xml.XmlElementDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.javaFX.fxml.FxmlConstants;
 import org.jetbrains.plugins.javaFX.fxml.JavaFxCommonClassNames;
@@ -47,7 +44,6 @@ import org.jetbrains.plugins.javaFX.fxml.descriptors.JavaFxPropertyAttributeDesc
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.Collections;
 
 /**
  * User: anna
@@ -132,8 +128,15 @@ public class JavaFxAnnotator implements Annotator {
     }
 
     @Override
-    public boolean equals(Object obj) {
-      return myElement.equals(obj);
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+
+      ColorIconRenderer renderer = (ColorIconRenderer)o;
+
+      if (myElement != null ? !myElement.equals(renderer.myElement) : renderer.myElement != null) return false;
+
+      return true;
     }
 
     @Override
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxReferencesContributor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxReferencesContributor.java
new file mode 100644
index 000000000000..ab1cfcb22880
--- /dev/null
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxReferencesContributor.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.javaFX.fxml.refs;
+
+import com.intellij.openapi.vfs.VirtualFileSystem;
+import com.intellij.openapi.vfs.newvfs.NewVirtualFileSystem;
+import com.intellij.psi.*;
+import com.intellij.psi.filters.ElementFilter;
+import com.intellij.psi.filters.position.FilterPattern;
+import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtil;
+import com.intellij.util.ProcessingContext;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.javaFX.fxml.JavaFxCommonClassNames;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import static com.intellij.patterns.PsiJavaPatterns.literalExpression;
+
+/**
+ * User: anna
+ * Date: 2/22/13
+ */
+public class JavaFxReferencesContributor extends PsiReferenceContributor {
+
+  @Override
+  public void registerReferenceProviders(PsiReferenceRegistrar registrar) {
+    registrar.registerReferenceProvider(literalExpression().and(new FilterPattern(new ElementFilter() {
+      public boolean isAcceptable(Object element, PsiElement context) {
+        final PsiLiteralExpression literalExpression = (PsiLiteralExpression)context;
+        PsiMethodCallExpression callExpression = PsiTreeUtil.getParentOfType(literalExpression, PsiMethodCallExpression.class);
+        if (callExpression != null && "getResource".equals(callExpression.getMethodExpression().getReferenceName())) {
+          final PsiMethodCallExpression superCall = PsiTreeUtil.getParentOfType(callExpression, PsiMethodCallExpression.class, true);
+          if (superCall != null) {
+            final PsiReferenceExpression methodExpression = superCall.getMethodExpression();
+            if ("load".equals(methodExpression.getReferenceName())) {
+              final PsiExpression qualifierExpression = methodExpression.getQualifierExpression();
+              PsiClass psiClass = null;
+              if (qualifierExpression instanceof PsiReferenceExpression) {
+                final PsiElement resolve = ((PsiReferenceExpression)qualifierExpression).resolve();
+                if (resolve instanceof PsiClass) {
+                  psiClass = (PsiClass)resolve;
+                }
+              } else if (qualifierExpression != null) {
+                psiClass = PsiUtil.resolveClassInType(qualifierExpression.getType());
+              }
+              if (psiClass != null && JavaFxCommonClassNames.JAVAFX_FXML_FXMLLOADER.equals(psiClass.getQualifiedName())) {
+                return true;
+              }
+            }
+          }
+        }
+        return false;
+      }
+
+      public boolean isClassAcceptable(Class hintClass) {
+        return true;
+      }
+    })), new PsiReferenceProvider() {
+      @NotNull
+      @Override
+      public PsiReference[] getReferencesByElement(@NotNull final PsiElement element, @NotNull ProcessingContext context) {
+        final Object value = ((PsiLiteralExpression)element).getValue();
+        final PsiDirectory directory = element.getContainingFile().getParent();
+        if (!(value instanceof String) || directory == null) return PsiReference.EMPTY_ARRAY;
+        final VirtualFileSystem fs = directory.getVirtualFile().getFileSystem();
+        return new FileReferenceSet((String)value, element, 1, null, ((NewVirtualFileSystem)fs).isCaseSensitive()) {
+          @NotNull
+          @Override
+          public Collection<PsiFileSystemItem> getDefaultContexts() {
+            if (!directory.isValid()) {
+              return super.getDefaultContexts();
+            }
+            return Collections.<PsiFileSystemItem>singletonList(directory);
+          }
+        }.getAllReferences();
+      }
+    });
+  }
+}
diff --git a/plugins/javaFX/testData/highlighting/NavigationFromMainToFxml.java b/plugins/javaFX/testData/highlighting/NavigationFromMainToFxml.java
new file mode 100644
index 000000000000..707140ca7c04
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/NavigationFromMainToFxml.java
@@ -0,0 +1,21 @@
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+public class Main extends Application {
+
+    @Override
+    public void start(Stage primaryStage) throws Exception{
+        Parent root = FXMLLoader.load(getClass().getResource("navi<caret>gationFromMainToFxml.fxml"));
+        primaryStage.setTitle("Hello World");
+        primaryStage.setScene(new Scene(root, 300, 275));
+        primaryStage.show();
+    }
+
+
+    public static void main(String[] args) {
+        launch(args);
+    }
+}
diff --git a/plugins/javaFX/testData/highlighting/navigationFromMainToFxml.fxml b/plugins/javaFX/testData/highlighting/navigationFromMainToFxml.fxml
new file mode 100644
index 000000000000..41c1c69d1ff5
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/navigationFromMainToFxml.fxml
@@ -0,0 +1,2 @@
+<?import javafx.scene.layout.GridPane?>
+<GridPane xmlns:fx="http://javafx.com/fxml"/>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/optimizeImports/collapseOnDemand.fxml b/plugins/javaFX/testData/optimizeImports/collapseOnDemand.fxml
new file mode 100644
index 000000000000..3cff767de1bd
--- /dev/null
+++ b/plugins/javaFX/testData/optimizeImports/collapseOnDemand.fxml
@@ -0,0 +1,15 @@
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.TableView?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <Button/>
+    <Label/>
+    <PasswordField/>
+    <RadioButton/>
+    <CheckBox/>
+    <TableView/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/optimizeImports/collapseOnDemand_after.fxml b/plugins/javaFX/testData/optimizeImports/collapseOnDemand_after.fxml
new file mode 100644
index 000000000000..4077faa98f05
--- /dev/null
+++ b/plugins/javaFX/testData/optimizeImports/collapseOnDemand_after.fxml
@@ -0,0 +1,10 @@
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.GridPane?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <Button/>
+    <Label/>
+    <PasswordField/>
+    <RadioButton/>
+    <CheckBox/>
+    <TableView/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/optimizeImports/removeUnused.fxml b/plugins/javaFX/testData/optimizeImports/removeUnused.fxml
new file mode 100644
index 000000000000..2fa5bb457add
--- /dev/null
+++ b/plugins/javaFX/testData/optimizeImports/removeUnused.fxml
@@ -0,0 +1,13 @@
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.TableView?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <Button/>
+    <Label/>
+    <PasswordField/>
+    <RadioButton/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/optimizeImports/removeUnused_after.fxml b/plugins/javaFX/testData/optimizeImports/removeUnused_after.fxml
new file mode 100644
index 000000000000..a1527c070f9d
--- /dev/null
+++ b/plugins/javaFX/testData/optimizeImports/removeUnused_after.fxml
@@ -0,0 +1,11 @@
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.layout.GridPane?>
+<GridPane xmlns:fx="http://javafx.com/fxml">
+    <Button/>
+    <Label/>
+    <PasswordField/>
+    <RadioButton/>
+</GridPane>
\ No newline at end of file
diff --git a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java
index 829a8ffcb352..75ad374423de 100644
--- a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java
+++ b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenArtifact.java
@@ -140,9 +140,9 @@ public class MavenArtifact implements Serializable {
     return getRelativePathForExtraArtifact(null, null);
   }
 
-  public String getFileNameWithBaseVersion() {
+  public String getFileNameWithBaseVersion(@Nullable String extraArtifactClassifier, @Nullable String customExtension) {
     StringBuilder res = new StringBuilder();
-    appendFileName(res, null, null);
+    appendFileName(res, extraArtifactClassifier, customExtension);
     return res.toString();
   }
 
@@ -166,7 +166,7 @@ public class MavenArtifact implements Serializable {
     result.append('/');
     result.append(myArtifactId);
     result.append('/');
-    result.append(myVersion);
+    result.append(myBaseVersion);
     result.append('/');
 
     appendFileName(result, extraArtifactClassifier, customExtension);
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java
index 04fc290b0c7b..a3b3cd35e410 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java
@@ -18,12 +18,17 @@ package org.jetbrains.idea.maven.dom;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.Function;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.hash.HashSet;
 import com.intellij.util.xml.DomUtil;
+import com.intellij.util.xml.GenericDomValue;
+import com.intellij.util.xml.impl.GenericDomValueReference;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.dom.model.*;
@@ -316,12 +321,33 @@ public class MavenDomProjectProcessorUtils {
                 groupId.equals(domDependency.getGroupId().getStringValue())) {
               return domDependency;
             }
+
+            if ("import".equals(domDependency.getScope().getRawText())) {
+              GenericDomValue<String> version = domDependency.getVersion();
+              if (version.getXmlElement() != null) {
+                GenericDomValueReference reference = new GenericDomValueReference(version);
+                PsiElement resolve = reference.resolve();
+
+                if (resolve instanceof XmlFile) {
+                  MavenDomProjectModel dependModel = MavenDomUtil.getMavenDomModel((PsiFile)resolve, MavenDomProjectModel.class);
+                  if (dependModel != null) {
+                    for (MavenDomDependency dep : dependModel.getDependencyManagement().getDependencies().getDependencies()) {
+                      if (artifactId.equals(dep.getArtifactId().getStringValue()) &&
+                          groupId.equals(dep.getGroupId().getStringValue())) {
+                        return domDependency;
+                      }
+                    }
+                  }
+                }
+              }
+            }
           }
         }
 
         return null;
       }
     };
+
     processDependenciesInDependencyManagement(model, processor, project);
 
     return processor.myResult;
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java
index c2987b0af5fa..97057bb43bcd 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java
@@ -40,6 +40,10 @@ public abstract class FacetImporter<FACET_TYPE extends Facet, FACET_CONFIG_TYPE
   protected final FACET_TYPE_TYPE myFacetType;
   protected final String myDefaultFacetName;
 
+  protected FacetImporter(String pluginGroupID, String pluginArtifactID, FACET_TYPE_TYPE type) {
+    this(pluginGroupID, pluginArtifactID, type, type.getDefaultFacetName());
+  }
+
   public FacetImporter(String pluginGroupID,
                        String pluginArtifactID,
                        FACET_TYPE_TYPE type,
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
index 2b834631b8cc..05c5d58551ae 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
@@ -15,18 +15,11 @@
  */
 package org.jetbrains.idea.maven.importing;
 
-import com.intellij.compiler.CompilerConfiguration;
-import com.intellij.compiler.CompilerConfigurationImpl;
-import com.intellij.openapi.compiler.options.ExcludeEntryDescription;
-import com.intellij.openapi.compiler.options.ExcludedEntriesConfiguration;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleType;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.*;
 import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.roots.libraries.LibraryTable;
-import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
@@ -39,10 +32,7 @@ import org.jetbrains.idea.maven.model.MavenArtifact;
 import org.jetbrains.idea.maven.model.MavenConstants;
 import org.jetbrains.idea.maven.project.*;
 import org.jetbrains.idea.maven.utils.MavenUtil;
-import org.jetbrains.jps.model.java.compiler.ProcessorConfigProfile;
-import org.jetbrains.jps.model.java.impl.compiler.ProcessorConfigProfileImpl;
 
-import java.io.File;
 import java.util.List;
 import java.util.Map;
 
@@ -246,7 +236,7 @@ public class MavenModuleImporter {
   }
 
   @NotNull
-  private static DependencyScope selectScope(String mavenScope) {
+  public static DependencyScope selectScope(String mavenScope) {
     if (MavenConstants.SCOPE_RUNTIME.equals(mavenScope)) return DependencyScope.RUNTIME;
     if (MavenConstants.SCOPE_TEST.equals(mavenScope)) return DependencyScope.TEST;
     if (MavenConstants.SCOPE_PROVIDEED.equals(mavenScope)) return DependencyScope.PROVIDED;
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
index 27c8f5cad1fb..6aaf850d5d28 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
@@ -334,8 +334,17 @@ public class MavenRootModelAdapter {
     library.addRoot(newUrl, type);
   }
 
-  private static boolean isRepositoryUrl(MavenArtifact artifact, String url, String classifier, String extension) {
-    return url.endsWith(artifact.getRelativePathForExtraArtifact(classifier, extension) + JarFileSystem.JAR_SEPARATOR);
+  private static boolean isRepositoryUrl(MavenArtifact artifact, String url, @Nullable String classifier, @Nullable String extension) {
+    if (!url.contains(artifact.getGroupId() + '/' + artifact.getArtifactId() + '/' + artifact.getBaseVersion() + '/' + artifact.getArtifactId() + '-')) {
+      return false;
+    }
+
+    String fileName = artifact.getFileNameWithBaseVersion(classifier, extension);
+    assert StringUtil.startsWithConcatenationOf(fileName, artifact.getArtifactId(), "-", artifact.getVersion());
+
+    String suffix = fileName.substring(artifact.getArtifactId().length() + 1 + artifact.getVersion().length());
+
+    return StringUtil.trimEnd(url, "!/").endsWith(suffix);
   }
 
   public static boolean isChangedByUser(Library library) {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
index 5acfe28fadad..533d46cf43c5 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
@@ -50,7 +50,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.idea.maven.model.MavenConstants;
 import org.jetbrains.idea.maven.utils.MavenMergingUpdateQueue;
-import org.jetbrains.idea.maven.utils.MavenProgressIndicator;
 import org.jetbrains.idea.maven.utils.MavenUtil;
 
 import java.io.File;
@@ -251,12 +250,7 @@ public class MavenProjectsManagerWatcher {
 
   public synchronized void setExplicitProfiles(Collection<String> profiles) {
     myProjectsTree.setExplicitProfiles(profiles);
-
-    if(myManager.getImportingSettings().isImportAutomatically()) {
-      scheduleUpdateAll(false, true);
-    } else {
-      myProjectsTree.updateAll(false, myGeneralSettings, new MavenProgressIndicator());
-    }
+    scheduleUpdateAll(false, false);
   }
 
   public void scheduleUpdateAll(boolean force, final boolean forceImportAndResolve) {
diff --git a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java
index 570014aba157..fa1f6491e172 100644
--- a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java
+++ b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptions.java
@@ -109,18 +109,22 @@ public class WebEditorOptions implements PersistentStateComponent<WebEditorOptio
     myAutomaticallyInsertRequiredAttributes = automaticallyInsertRequiredAttributes;
   }
 
+  /**
+   * @deprecated use {@link com.intellij.application.options.emmet.EmmetOptions#getEmmetExpandShortcut()}
+   */
+  @Deprecated
   public int getZenCodingExpandShortcut() {
     return myZenCodingExpandShortcut;
   }
 
-  public void setZenCodingExpandShortcut(int zenCodingExpandShortcut) {
-    myZenCodingExpandShortcut = zenCodingExpandShortcut;
-  }
-
   public boolean isAutomaticallyStartAttribute() {
     return myAutomaticallyStartAttribute;
   }
 
+  /**
+   * @deprecated use {@link com.intellij.application.options.emmet.EmmetOptions#isEmmetEnabled()}
+   */
+  @Deprecated
   public boolean isZenCodingEnabled() {
     return myZenCodingEnabled;
   }
@@ -129,10 +133,6 @@ public class WebEditorOptions implements PersistentStateComponent<WebEditorOptio
     myAutomaticallyStartAttribute = automaticallyStartAttribute;
   }
 
-  public void setZenCodingEnabled(boolean zenCodingEnabled) {
-    myZenCodingEnabled = zenCodingEnabled;
-  }
-
   public boolean isAutomaticallyInsertRequiredSubTags() {
     return myAutomaticallyInsertRequiredSubTags;
   }
diff --git a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsForm.form b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsForm.form
index 0030a84058ef..920e84671bd0 100644
--- a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsForm.form
+++ b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsForm.form
@@ -8,7 +8,7 @@
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="247ce" layout-manager="GridLayoutManager" row-count="6" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="247ce" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
@@ -21,7 +21,7 @@
         <children>
           <component id="f6c8c" class="javax.swing.JCheckBox" binding="myAutomaticallyInsertClosingTagCheckBox" default-binding="true">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Automatically insert closing tag"/>
@@ -29,7 +29,7 @@
           </component>
           <component id="9f825" class="javax.swing.JCheckBox" binding="myAutomaticallyInsertRequiredAttributesCheckBox" default-binding="true">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Automatically insert required attributes"/>
@@ -37,43 +37,16 @@
           </component>
           <component id="4bf74" class="javax.swing.JCheckBox" binding="myAutomaticallyStartAttributeAfterCheckBox" default-binding="true">
             <constraints>
-              <grid row="3" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <selected value="false"/>
               <text value="Automatically start attribute"/>
             </properties>
           </component>
-          <component id="ba426" class="javax.swing.JCheckBox" binding="myEnableZenCodingCheckBox">
-            <constraints>
-              <grid row="4" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Enable Zen Coding"/>
-            </properties>
-          </component>
-          <component id="7c51c" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="3" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Expand abbreviation with"/>
-            </properties>
-          </component>
-          <component id="ed567" class="javax.swing.JComboBox" binding="myZenCodingExpandShortcutCombo">
-            <constraints>
-              <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties/>
-          </component>
-          <hspacer id="8ee6f">
-            <constraints>
-              <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-          </hspacer>
           <component id="c21d3" class="javax.swing.JCheckBox" binding="myAutomaticallyInsertRequiredSubTagsCheckBox" default-binding="true">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Automatically insert required subtags"/>
diff --git a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java
index eb1ff2ad95f6..da7f38ae0428 100644
--- a/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java
+++ b/xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java
@@ -15,15 +15,11 @@
  */
 package com.intellij.application.options.editor;
 
-import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.template.impl.TemplateSettings;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.xml.XmlBundle;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 /**
  * @author spleaner
@@ -34,23 +30,7 @@ public class WebEditorOptionsProvider implements EditorOptionsProvider {
   private JCheckBox myAutomaticallyInsertRequiredAttributesCheckBox;
   private JCheckBox myAutomaticallyInsertRequiredSubTagsCheckBox;
   private JCheckBox myAutomaticallyStartAttributeAfterCheckBox;
-  private JCheckBox myEnableZenCodingCheckBox;
-  private JComboBox myZenCodingExpandShortcutCombo;
 
-  private static final String SPACE = CodeInsightBundle.message("template.shortcut.space");
-  private static final String TAB = CodeInsightBundle.message("template.shortcut.tab");
-  private static final String ENTER = CodeInsightBundle.message("template.shortcut.enter");
-
-  {
-    myZenCodingExpandShortcutCombo.addItem(SPACE);
-    myZenCodingExpandShortcutCombo.addItem(TAB);
-    myZenCodingExpandShortcutCombo.addItem(ENTER);
-    myEnableZenCodingCheckBox.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        myZenCodingExpandShortcutCombo.setEnabled(myEnableZenCodingCheckBox.isSelected());
-      }
-    });
-  }
 
   public String getDisplayName() {
     return XmlBundle.message("web.editor.configuration.title");
@@ -64,24 +44,13 @@ public class WebEditorOptionsProvider implements EditorOptionsProvider {
     return myWholePanel;
   }
 
-  private char getSelectedZenCodingExpandShortcut() {
-    Object selectedItem = myZenCodingExpandShortcutCombo.getSelectedItem();
-    if (TAB.equals(selectedItem)) {
-      return TemplateSettings.TAB_CHAR;
-    }
-    else if (ENTER.equals(selectedItem)) {
-      return TemplateSettings.ENTER_CHAR;
-    }
-    return TemplateSettings.SPACE_CHAR;
-  }
+
 
   public boolean isModified() {
     final WebEditorOptions xmlEditorOptions = WebEditorOptions.getInstance();
     return xmlEditorOptions.isAutomaticallyInsertClosingTag() != myAutomaticallyInsertClosingTagCheckBox.isSelected() ||
            xmlEditorOptions.isAutomaticallyInsertRequiredAttributes() != myAutomaticallyInsertRequiredAttributesCheckBox.isSelected() ||
            xmlEditorOptions.isAutomaticallyStartAttribute() != myAutomaticallyStartAttributeAfterCheckBox.isSelected() ||
-           xmlEditorOptions.isZenCodingEnabled() != myEnableZenCodingCheckBox.isSelected() ||
-           xmlEditorOptions.getZenCodingExpandShortcut() != getSelectedZenCodingExpandShortcut() ||
            xmlEditorOptions.isAutomaticallyInsertRequiredSubTags() != myAutomaticallyInsertRequiredSubTagsCheckBox.isSelected();
   }
 
@@ -91,8 +60,6 @@ public class WebEditorOptionsProvider implements EditorOptionsProvider {
     xmlEditorOptions.setAutomaticallyInsertRequiredAttributes(myAutomaticallyInsertRequiredAttributesCheckBox.isSelected());
     xmlEditorOptions.setAutomaticallyInsertRequiredSubTags(myAutomaticallyInsertRequiredSubTagsCheckBox.isSelected());
     xmlEditorOptions.setAutomaticallyStartAttribute(myAutomaticallyStartAttributeAfterCheckBox.isSelected());
-    xmlEditorOptions.setZenCodingEnabled(myEnableZenCodingCheckBox.isSelected());
-    xmlEditorOptions.setZenCodingExpandShortcut(getSelectedZenCodingExpandShortcut());
   }
 
   public void reset() {
@@ -101,19 +68,6 @@ public class WebEditorOptionsProvider implements EditorOptionsProvider {
     myAutomaticallyInsertRequiredAttributesCheckBox.setSelected(xmlEditorOptions.isAutomaticallyInsertRequiredAttributes());
     myAutomaticallyInsertRequiredSubTagsCheckBox.setSelected(xmlEditorOptions.isAutomaticallyInsertRequiredSubTags());
     myAutomaticallyStartAttributeAfterCheckBox.setSelected(xmlEditorOptions.isAutomaticallyStartAttribute());
-    myEnableZenCodingCheckBox.setSelected(xmlEditorOptions.isZenCodingEnabled());
-    myZenCodingExpandShortcutCombo.setEnabled(xmlEditorOptions.isZenCodingEnabled());
-
-    char shortcut = (char)WebEditorOptions.getInstance().getZenCodingExpandShortcut();
-    if (shortcut == TemplateSettings.TAB_CHAR) {
-      myZenCodingExpandShortcutCombo.setSelectedItem(TAB);
-    }
-    else if (shortcut == TemplateSettings.ENTER_CHAR) {
-      myZenCodingExpandShortcutCombo.setSelectedItem(ENTER);
-    }
-    else {
-      myZenCodingExpandShortcutCombo.setSelectedItem(SPACE);
-    }
   }
 
   public void disposeUIResources() {
diff --git a/xml/impl/src/com/intellij/application/options/emmet/CssEditPrefixesListPanel.java b/xml/impl/src/com/intellij/application/options/emmet/CssEditPrefixesListPanel.java
new file mode 100644
index 000000000000..aa6d6ec5620d
--- /dev/null
+++ b/xml/impl/src/com/intellij/application/options/emmet/CssEditPrefixesListPanel.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.application.options.emmet;
+
+import com.intellij.openapi.ui.Messages;
+import com.intellij.ui.*;
+import com.intellij.ui.components.JBCheckBox;
+import com.intellij.ui.table.TableView;
+import com.intellij.util.ui.ColumnInfo;
+import com.intellij.util.ui.ListTableModel;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableCellRenderer;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * User: zolotov
+ * Date: 2/20/13
+ */
+public class CssEditPrefixesListPanel {
+  private final ListTableModel<CssPrefixInfo> myPrefixesModel;
+  private final TableView<CssPrefixInfo> myPrefixesTableView;
+
+  public CssEditPrefixesListPanel() {
+    ColumnInfo[] columns = new ColumnInfo[CssPrefix.values().length + 1];
+    columns[0] = new PropertyColumn();
+    CssPrefix[] values = CssPrefix.values();
+    for (int i = 0; i < values.length; i++) {
+      columns[i + 1] = new PrefixColumnInfo(values[i]);
+    }
+
+    myPrefixesModel = new ListTableModel<CssPrefixInfo>(columns, new ArrayList<CssPrefixInfo>(), 0);
+    myPrefixesModel.setSortable(true);
+    myPrefixesTableView = new TableView<CssPrefixInfo>(myPrefixesModel);
+    myPrefixesTableView.setAutoCreateRowSorter(true);
+    myPrefixesTableView.setBorder(null);
+    myPrefixesTableView.getRowSorter().toggleSortOrder(0);
+
+    new TableViewSpeedSearch(myPrefixesTableView) {
+      @Override
+      protected String getElementText(final Object element) {
+        CssPrefixInfo prefixInfo = (CssPrefixInfo)element;
+        return prefixInfo.getPropertyName();
+      }
+    };
+  }
+
+  public void setEnabled(boolean value) {
+    myPrefixesTableView.setEnabled(value);
+  }
+
+  public void setState(List<CssPrefixInfo> prefixInfos) {
+    myPrefixesModel.setItems(prefixInfos);
+  }
+
+  public List<CssPrefixInfo> getState() {
+    return myPrefixesModel.getItems();
+  }
+
+  public JPanel createMainComponent() {
+    final ToolbarDecorator decorator = ToolbarDecorator.createDecorator(myPrefixesTableView);
+    decorator.disableUpDownActions();
+    final JPanel panel = decorator.createPanel();
+    decorator.setAddAction(new AnActionButtonRunnable() {
+      @Override
+      public void run(AnActionButton button) {
+        TableUtil.stopEditing(myPrefixesTableView);
+        String propertyName = Messages.showInputDialog(myPrefixesTableView, "Property name:", "New Css Property", null);
+        if (propertyName != null && !propertyName.isEmpty()) {
+          List<CssPrefixInfo> items = myPrefixesModel.getItems();
+          for (CssPrefixInfo state : items) {
+            if (propertyName.equals(state.getPropertyName())) {
+              myPrefixesTableView.clearSelection();
+              myPrefixesTableView.addSelection(state);
+              scrollToSelection();
+              return;
+            }
+          }
+          CssPrefixInfo newPrefixInfo = new CssPrefixInfo(propertyName);
+          myPrefixesModel.addRow(newPrefixInfo);
+          myPrefixesTableView.clearSelection();
+          myPrefixesTableView.addSelection(newPrefixInfo);
+          scrollToSelection();
+        }
+        myPrefixesTableView.requestFocus();
+      }
+
+      private void scrollToSelection() {
+        int selectedRow = myPrefixesTableView.getSelectedRow();
+        if (selectedRow >= 0) {
+          myPrefixesTableView.scrollRectToVisible(myPrefixesTableView.getCellRect(selectedRow, 0, true));
+        }
+      }
+    }).setRemoveAction(new AnActionButtonRunnable() {
+      @Override
+      public void run(AnActionButton button) {
+        TableUtil.stopEditing(myPrefixesTableView);
+        CssPrefixInfo selectedObject = myPrefixesTableView.getSelectedObject();
+        int selectedRow = myPrefixesTableView.getSelectedRow();
+        int index = myPrefixesModel.indexOf(selectedObject);
+        if (0 <= index && index < myPrefixesModel.getRowCount()) {
+          myPrefixesModel.removeRow(index);
+          if (selectedRow < myPrefixesTableView.getRowCount()) {
+            myPrefixesTableView.setRowSelectionInterval(selectedRow, selectedRow);
+          }
+          else {
+            if (selectedRow > 0) {
+              myPrefixesTableView.setRowSelectionInterval(selectedRow - 1, selectedRow - 1);
+            }
+          }
+        }
+        myPrefixesTableView.getParent().repaint();
+        myPrefixesTableView.requestFocus();
+      }
+    });
+    return panel;
+  }
+
+  private static class PropertyColumn extends ColumnInfo<CssPrefixInfo, String> {
+    public PropertyColumn() {
+      super("Property");
+    }
+
+    @Nullable
+    @Override
+    public String valueOf(CssPrefixInfo prefixInfo) {
+      return prefixInfo.getPropertyName();
+    }
+  }
+
+  private class PrefixColumnInfo extends ColumnInfo<CssPrefixInfo, Boolean> {
+    private final CssPrefix myPrefix;
+    private final BooleanTableCellRenderer myCellRenderer = new BooleanTableCellRenderer();
+
+    @Nullable
+    @Override
+    public TableCellRenderer getRenderer(CssPrefixInfo state) {
+      return myCellRenderer;
+    }
+
+    public PrefixColumnInfo(CssPrefix prefix) {
+      super(prefix.getText());
+      myPrefix = prefix;
+    }
+
+    @Nullable
+    @Override
+    public TableCellEditor getEditor(CssPrefixInfo prefixInfo) {
+      JBCheckBox box = new JBCheckBox();
+      box.setHorizontalAlignment(SwingConstants.CENTER);
+      return new DefaultCellEditor(box);
+    }
+
+    @Override
+    public boolean isCellEditable(CssPrefixInfo prefixInfo) {
+      return myPrefixesTableView.isEnabled();
+    }
+
+    public final Class<Boolean> getColumnClass() {
+      return Boolean.class;
+    }
+
+    @Override
+    public final void setValue(final CssPrefixInfo prefixInfo, final Boolean aValue) {
+      prefixInfo.setValue(myPrefix, aValue);
+    }
+
+    @Nullable
+    @Override
+    public final Boolean valueOf(CssPrefixInfo state) {
+      return state.getValue(myPrefix);
+    }
+  }
+}
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgPlatformFacade.java b/xml/impl/src/com/intellij/application/options/emmet/CssPrefix.java
similarity index 65%
rename from plugins/hg4idea/src/org/zmlx/hg4idea/HgPlatformFacade.java
rename to xml/impl/src/com/intellij/application/options/emmet/CssPrefix.java
index 3eebfbd53098..da3bae3ab476 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgPlatformFacade.java
+++ b/xml/impl/src/com/intellij/application/options/emmet/CssPrefix.java
@@ -13,20 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zmlx.hg4idea;
+package com.intellij.application.options.emmet;
 
 /**
- * @author Nadya Zabrodina
- */
+* User: zolotov
+* Date: 2/21/13
+*/
+public enum CssPrefix {
+  WEBKIT(0x1), MOZ(0x2), MS(0x4), O(0x8);
 
-import com.intellij.dvcs.DvcsPlatformFacade;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
+  final int myIntMask;
 
-public interface HgPlatformFacade extends DvcsPlatformFacade {
-
-  @Override
-  @NotNull
-  HgVcs getVcs(@NotNull Project project);
+  CssPrefix(int intMask) {
+    myIntMask = intMask;
+  }
 
+  public String getText() {
+    return "-" + toString().toLowerCase();
+  }
 }
diff --git a/xml/impl/src/com/intellij/application/options/emmet/CssPrefixInfo.java b/xml/impl/src/com/intellij/application/options/emmet/CssPrefixInfo.java
new file mode 100644
index 000000000000..4f67b14423c4
--- /dev/null
+++ b/xml/impl/src/com/intellij/application/options/emmet/CssPrefixInfo.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.application.options.emmet;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.List;
+
+import static com.google.common.collect.Lists.newArrayList;
+import static com.google.common.collect.Sets.newHashSet;
+
+/**
+ * User: zolotov
+ * Date: 2/20/13
+ */
+public class CssPrefixInfo {
+  @NotNull
+  private final String myPropertyName;
+  @NotNull
+  private final Collection<CssPrefix> myEnabledPrefixes;
+
+  public CssPrefixInfo(@NotNull String propertyName, CssPrefix... enabledPrefixes) {
+    myPropertyName = propertyName;
+    myEnabledPrefixes = newHashSet(enabledPrefixes);
+    for (CssPrefix prefix : enabledPrefixes) {
+      setValue(prefix, true);
+    }
+  }
+
+  public CssPrefixInfo(@NotNull String propertyName, Collection<CssPrefix> enabledPrefixes) {
+    myPropertyName = propertyName;
+    myEnabledPrefixes = newHashSet(enabledPrefixes);
+    for (CssPrefix prefix : enabledPrefixes) {
+      setValue(prefix, true);
+    }
+  }
+
+  @NotNull
+  public Collection<CssPrefix> getEnabledPrefixes() {
+    return myEnabledPrefixes;
+  }
+
+  public void setValue(CssPrefix prefix, boolean value) {
+    if (value) {
+      myEnabledPrefixes.add(prefix);
+    } else {
+      myEnabledPrefixes.remove(prefix);
+    }
+  }
+
+  public boolean getValue(CssPrefix prefix) {
+    return myEnabledPrefixes.contains(prefix);
+  }
+
+  @NotNull
+  public String getPropertyName() {
+    return myPropertyName;
+  }
+
+  public static CssPrefixInfo fromIntegerValue(String propertyName, Integer value) {
+    if (value == null) {
+      return new CssPrefixInfo(propertyName);
+    }
+    List<CssPrefix> enabledPrefixes = newArrayList();
+    for (CssPrefix prefix : CssPrefix.values()) {
+      if ((value & prefix.myIntMask) > 0) {
+        enabledPrefixes.add(prefix);
+      }
+    }
+    return new CssPrefixInfo(propertyName, enabledPrefixes);
+  }
+
+  public int toIntegerValue() {
+    int result = 0;
+    for (CssPrefix prefix : myEnabledPrefixes) {
+      if (getValue(prefix)) {
+        result |= prefix.myIntMask;
+      }
+    }
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    return "CssPrefixInfo{" +
+           "myPropertyName='" + myPropertyName + '\'' +
+           ", myEnabledPrefixes=" + myEnabledPrefixes +
+           '}';
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    CssPrefixInfo that = (CssPrefixInfo)o;
+
+    if (!myEnabledPrefixes.equals(that.myEnabledPrefixes)) return false;
+    if (!myPropertyName.equals(that.myPropertyName)) return false;
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = myPropertyName.hashCode();
+    result = 31 * result + myEnabledPrefixes.hashCode();
+    return result;
+  }
+}
diff --git a/xml/impl/src/com/intellij/application/options/emmet/EmmetConfigurable.form b/xml/impl/src/com/intellij/application/options/emmet/EmmetConfigurable.form
new file mode 100644
index 000000000000..62127bcf42e3
--- /dev/null
+++ b/xml/impl/src/com/intellij/application/options/emmet/EmmetConfigurable.form
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.application.options.emmet.EmmetConfigurable">
+  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="500" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <component id="446a3" class="com.intellij.ui.components.JBCheckBox" binding="myEnableEmmetJBCheckBox" default-binding="true">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="messages/XmlBundle" key="zen.coding.enable.label"/>
+        </properties>
+      </component>
+      <component id="c71a" class="com.intellij.ui.components.JBLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <labelFor value="ce319"/>
+          <text value="Expand abbreviation with"/>
+        </properties>
+      </component>
+      <component id="59f5a" class="javax.swing.JComboBox" binding="myEmmetExpandShortcutCombo">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <model/>
+        </properties>
+      </component>
+      <grid id="369dc" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <clientProperties>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
+        </clientProperties>
+        <border type="none" title="XML"/>
+        <children>
+          <component id="9ed4c" class="com.intellij.ui.components.JBCheckBox" binding="myEnableBEMFilterJBCheckBox" default-binding="true">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="messages/XmlBundle" key="emmet.enable.bem.filter"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+      <grid id="bd64d" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <clientProperties>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
+        </clientProperties>
+        <border type="none" title="CSS"/>
+        <children>
+          <component id="65354" class="com.intellij.ui.components.JBCheckBox" binding="myAutoInsertCssVendorJBCheckBox" default-binding="true">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="messages/XmlBundle" key="emmet.auto.insert.vendor.prefixes"/>
+            </properties>
+          </component>
+          <grid id="612b" binding="myPrefixesPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children/>
+          </grid>
+        </children>
+      </grid>
+    </children>
+  </grid>
+</form>
diff --git a/xml/impl/src/com/intellij/application/options/emmet/EmmetConfigurable.java b/xml/impl/src/com/intellij/application/options/emmet/EmmetConfigurable.java
new file mode 100644
index 000000000000..5f69489785da
--- /dev/null
+++ b/xml/impl/src/com/intellij/application/options/emmet/EmmetConfigurable.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.application.options.emmet;
+
+import com.intellij.codeInsight.CodeInsightBundle;
+import com.intellij.codeInsight.template.impl.TemplateSettings;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.options.Configurable;
+import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.openapi.options.SearchableConfigurable;
+import com.intellij.ui.components.JBCheckBox;
+import com.intellij.xml.XmlBundle;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * User: zolotov
+ * Date: 2/20/13
+ */
+public class EmmetConfigurable implements SearchableConfigurable, Disposable, Configurable.NoScroll {
+  private JBCheckBox myEnableEmmetJBCheckBox;
+  private JComboBox myEmmetExpandShortcutCombo;
+  private JBCheckBox myEnableBEMFilterJBCheckBox;
+  private JBCheckBox myAutoInsertCssVendorJBCheckBox;
+  private JPanel myPanel;
+  private JPanel myPrefixesPanel;
+
+  private CssEditPrefixesListPanel myCssEditPrefixesListPanel;
+
+  private static final String SPACE = CodeInsightBundle.message("template.shortcut.space");
+  private static final String TAB = CodeInsightBundle.message("template.shortcut.tab");
+  private static final String ENTER = CodeInsightBundle.message("template.shortcut.enter");
+
+  public EmmetConfigurable() {
+    myEnableEmmetJBCheckBox.addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        boolean selected = myEnableEmmetJBCheckBox.isSelected();
+        myEmmetExpandShortcutCombo.setEnabled(selected);
+        //myInsertFallbackGradientColorJBCheckBox.setEnabled(selected);
+        myAutoInsertCssVendorJBCheckBox.setEnabled(selected);
+        myCssEditPrefixesListPanel.setEnabled(selected && myAutoInsertCssVendorJBCheckBox.isSelected());
+        myEnableBEMFilterJBCheckBox.setEnabled(selected);
+      }
+    });
+
+    myAutoInsertCssVendorJBCheckBox.addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        myCssEditPrefixesListPanel.setEnabled(myAutoInsertCssVendorJBCheckBox.isSelected());
+      }
+    });
+
+    myEmmetExpandShortcutCombo.addItem(SPACE);
+    myEmmetExpandShortcutCombo.addItem(TAB);
+    myEmmetExpandShortcutCombo.addItem(ENTER);
+  }
+
+  private char getSelectedEmmetExpandShortcut() {
+    Object selectedItem = myEmmetExpandShortcutCombo.getSelectedItem();
+    if (TAB.equals(selectedItem)) {
+      return TemplateSettings.TAB_CHAR;
+    }
+    else if (ENTER.equals(selectedItem)) {
+      return TemplateSettings.ENTER_CHAR;
+    }
+    return TemplateSettings.SPACE_CHAR;
+  }
+
+  @Override
+  public void dispose() {
+  }
+
+  @NotNull
+  @Override
+  public String getId() {
+    return "reference.settingsdialog.emmet";
+  }
+
+  @Nullable
+  @Override
+  public Runnable enableSearch(String option) {
+    return null;
+  }
+
+  @Nls
+  @Override
+  public String getDisplayName() {
+    return XmlBundle.message("emmet.configuration.title");
+  }
+
+  @Nullable
+  @Override
+  public String getHelpTopic() {
+    return getId();
+  }
+
+  @Nullable
+  @Override
+  public JComponent createComponent() {
+    return myPanel;
+  }
+
+  @Override
+  public boolean isModified() {
+    EmmetOptions emmetOptions = EmmetOptions.getInstance();
+    return emmetOptions.isEmmetEnabled() != myEnableEmmetJBCheckBox.isSelected() ||
+           emmetOptions.isBemFilterEnabledByDefault() != myEnableBEMFilterJBCheckBox.isSelected() ||
+           emmetOptions.isAutoInsertCssPrefixedEnabled() != myAutoInsertCssVendorJBCheckBox.isSelected() ||
+           !emmetOptions.getAllPrefixInfo().equals(myCssEditPrefixesListPanel.getState()) ||
+           emmetOptions.getEmmetExpandShortcut() != getSelectedEmmetExpandShortcut();
+  }
+
+
+  @Override
+  public void apply() throws ConfigurationException {
+    EmmetOptions emmetOptions = EmmetOptions.getInstance();
+    emmetOptions.setEmmetEnabled(myEnableEmmetJBCheckBox.isSelected());
+    emmetOptions.setEnableBemFilterByDefault(myEnableBEMFilterJBCheckBox.isSelected());
+    emmetOptions.setEmmetExpandShortcut(getSelectedEmmetExpandShortcut());
+    emmetOptions.setAutoInsertCssPrefixedEnabled(myAutoInsertCssVendorJBCheckBox.isSelected());
+    emmetOptions.setPrefixInfo(myCssEditPrefixesListPanel.getState());
+  }
+
+  @Override
+  public void reset() {
+    EmmetOptions emmetOptions = EmmetOptions.getInstance();
+    myEnableEmmetJBCheckBox.setSelected(emmetOptions.isEmmetEnabled());
+    myEnableBEMFilterJBCheckBox.setEnabled(emmetOptions.isEmmetEnabled());
+    myEnableBEMFilterJBCheckBox.setSelected(emmetOptions.isBemFilterEnabledByDefault());
+    myEmmetExpandShortcutCombo.setEnabled(emmetOptions.isEmmetEnabled());
+    myAutoInsertCssVendorJBCheckBox.setEnabled(emmetOptions.isEmmetEnabled());
+    myAutoInsertCssVendorJBCheckBox.setSelected(emmetOptions.isAutoInsertCssPrefixedEnabled());
+    //myInsertFallbackGradientColorJBCheckBox.setEnabled(emmetOptions.isEmmetEnabled());
+    //myInsertFallbackGradientColorJBCheckBox.setSelected(emmetOptions.isInsertFallbackGradientColorEnabled());
+
+    myCssEditPrefixesListPanel.setEnabled(emmetOptions.isEmmetEnabled() && emmetOptions.isAutoInsertCssPrefixedEnabled());
+    myCssEditPrefixesListPanel.setState(emmetOptions.getAllPrefixInfo());
+
+    char shortcut = (char)emmetOptions.getEmmetExpandShortcut();
+    if (shortcut == TemplateSettings.TAB_CHAR) {
+      myEmmetExpandShortcutCombo.setSelectedItem(TAB);
+    }
+    else if (shortcut == TemplateSettings.ENTER_CHAR) {
+      myEmmetExpandShortcutCombo.setSelectedItem(ENTER);
+    }
+    else {
+      myEmmetExpandShortcutCombo.setSelectedItem(SPACE);
+    }
+  }
+
+  @Override
+  public void disposeUIResources() {
+    myCssEditPrefixesListPanel = null;
+    myPrefixesPanel = null;
+  }
+
+  private void createUIComponents() {
+    myCssEditPrefixesListPanel = new CssEditPrefixesListPanel();
+    myPrefixesPanel = myCssEditPrefixesListPanel.createMainComponent();
+    myPrefixesPanel.setEnabled(true);
+  }
+}
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgPlatformFacadeImpl.java b/xml/impl/src/com/intellij/application/options/emmet/EmmetConfigurableProvider.java
similarity index 53%
rename from plugins/hg4idea/src/org/zmlx/hg4idea/HgPlatformFacadeImpl.java
rename to xml/impl/src/com/intellij/application/options/emmet/EmmetConfigurableProvider.java
index 4a13cb4b4d45..2d13a7382516 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgPlatformFacadeImpl.java
+++ b/xml/impl/src/com/intellij/application/options/emmet/EmmetConfigurableProvider.java
@@ -13,22 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.zmlx.hg4idea;
+package com.intellij.application.options.emmet;
 
-import com.intellij.dvcs.DvcsPlatformFacadeImpl;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vcs.ProjectLevelVcsManager;
-import org.jetbrains.annotations.NotNull;
+import com.intellij.openapi.options.Configurable;
+import com.intellij.openapi.options.ConfigurableProvider;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * @author Nadya Zabrodina
+ * User: zolotov
+ * Date: 2/20/13
  */
-public class HgPlatformFacadeImpl extends DvcsPlatformFacadeImpl implements HgPlatformFacade {
-
-  @NotNull
+public class EmmetConfigurableProvider extends ConfigurableProvider {
+  @Nullable
   @Override
-  public HgVcs getVcs(@NotNull Project project) {
-    final ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(project);
-    return (HgVcs)vcsManager.findVcsByName(HgVcs.VCS_NAME);
+  public Configurable createConfigurable() {
+    return new EmmetConfigurable();
   }
 }
diff --git a/xml/impl/src/com/intellij/application/options/emmet/EmmetOptions.java b/xml/impl/src/com/intellij/application/options/emmet/EmmetOptions.java
new file mode 100644
index 000000000000..70ddaa453aae
--- /dev/null
+++ b/xml/impl/src/com/intellij/application/options/emmet/EmmetOptions.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.application.options.emmet;
+
+import com.intellij.application.options.editor.WebEditorOptions;
+import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.components.*;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.JDOMUtil;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.xmlb.XmlSerializerUtil;
+import com.intellij.xml.XmlBundle;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.collect.Lists.newLinkedList;
+import static com.google.common.collect.Maps.newHashMap;
+import static com.google.common.io.Resources.getResource;
+
+/**
+ * User: zolotov
+ * Date: 2/20/13
+ */
+@State(
+  name = "EmmetOptions",
+  storages = {
+    @Storage(
+      file = StoragePathMacros.APP_CONFIG + "/emmet.xml"
+    )}
+)
+public class EmmetOptions implements PersistentStateComponent<EmmetOptions>, ExportableComponent {
+  private boolean myEnableBemFilterByDefault = false;
+  private boolean myEmmetEnabled = WebEditorOptions.getInstance().isZenCodingEnabled();
+  private int myEmmetExpandShortcut = WebEditorOptions.getInstance().getZenCodingExpandShortcut();
+  private boolean myAutoInsertCssPrefixedEnabled = true;
+  @Nullable
+  private Map<String, Integer> prefixes = null;
+
+  public void setPrefixInfo(List<CssPrefixInfo> prefixInfos) {
+    prefixes = newHashMap();
+    for (CssPrefixInfo state : prefixInfos) {
+      prefixes.put(state.getPropertyName(), state.toIntegerValue());
+    }
+  }
+
+  public CssPrefixInfo getPrefixStateForProperty(String propertyName) {
+    return CssPrefixInfo.fromIntegerValue(propertyName, getPrefixes().get(propertyName));
+  }
+
+  public List<CssPrefixInfo> getAllPrefixInfo() {
+    List<CssPrefixInfo> result = newLinkedList();
+    for (Map.Entry<String, Integer> entry : getPrefixes().entrySet()) {
+      result.add(CssPrefixInfo.fromIntegerValue(entry.getKey(), entry.getValue()));
+    }
+    return result;
+  }
+
+  public boolean isBemFilterEnabledByDefault() {
+    return myEnableBemFilterByDefault;
+  }
+
+  public void setEnableBemFilterByDefault(boolean enableBemFilterByDefault) {
+    myEnableBemFilterByDefault = enableBemFilterByDefault;
+  }
+
+  public void setEmmetExpandShortcut(int emmetExpandShortcut) {
+    myEmmetExpandShortcut = emmetExpandShortcut;
+  }
+
+  public int getEmmetExpandShortcut() {
+    return myEmmetExpandShortcut;
+  }
+
+  public boolean isEmmetEnabled() {
+    return myEmmetEnabled;
+  }
+
+  public void setEmmetEnabled(boolean emmetEnabled) {
+    myEmmetEnabled = emmetEnabled;
+  }
+
+  public boolean isAutoInsertCssPrefixedEnabled() {
+    return myAutoInsertCssPrefixedEnabled;
+  }
+
+  public void setAutoInsertCssPrefixedEnabled(boolean autoInsertCssPrefixedEnabled) {
+    myAutoInsertCssPrefixedEnabled = autoInsertCssPrefixedEnabled;
+  }
+
+  @NotNull
+  @Override
+  public File[] getExportFiles() {
+    return new File[]{PathManager.getOptionsFile("emmet")};
+  }
+
+  @NotNull
+  @Override
+  public String getPresentableName() {
+    return XmlBundle.message("emmet.configuration.title");
+  }
+
+  @Nullable
+  @Override
+  public EmmetOptions getState() {
+    return this;
+  }
+
+  public void loadState(final EmmetOptions state) {
+    XmlSerializerUtil.copyBean(state, this);
+  }
+
+  public static EmmetOptions getInstance() {
+    return ServiceManager.getService(EmmetOptions.class);
+  }
+
+  @SuppressWarnings("UnusedDeclaration")
+  @NotNull
+  public Map<String, Integer> getPrefixes() {
+    if (prefixes == null) {
+      prefixes = loadDefaultPrefixes();
+    }
+    return prefixes;
+  }
+
+  @SuppressWarnings("UnusedDeclaration")
+  public void setPrefixes(@Nullable Map<String, Integer> prefixes) {
+    this.prefixes = prefixes;
+  }
+
+  public static Map<String, Integer> loadDefaultPrefixes() {
+    Map<String, Integer> result = newHashMap();
+    try {
+      Document document = JDOMUtil.loadDocument(getResource(EmmetOptions.class, "emmet_default_options.xml"));
+      Element prefixesElement = document.getRootElement().getChild("prefixes");
+      if (prefixesElement != null) {
+        for (Object entry : prefixesElement.getChildren("entry")) {
+          Element entryElement = (Element)entry;
+          String propertyName = entryElement.getAttributeValue("key");
+          Integer value = StringUtil.parseInt(entryElement.getAttributeValue("value"), 0);
+          result.put(propertyName, value);
+        }
+      }
+    }
+    catch (Exception e) {
+      Logger.getInstance(EmmetOptions.class).warn(e);
+      return result;
+    }
+    return result;
+  }
+}
diff --git a/xml/impl/src/com/intellij/application/options/emmet/emmet_default_options.xml b/xml/impl/src/com/intellij/application/options/emmet/emmet_default_options.xml
new file mode 100644
index 000000000000..287ab5f703f3
--- /dev/null
+++ b/xml/impl/src/com/intellij/application/options/emmet/emmet_default_options.xml
@@ -0,0 +1,216 @@
+<DefaultEmmetOptions>
+  <prefixes>
+    <entry key="accelerator" value="4"/>
+    <entry key="accesskey" value="8"/>
+    <entry key="animation" value="9"/>
+    <entry key="animation-delay" value="11"/>
+    <entry key="animation-direction" value="11"/>
+    <entry key="animation-duration" value="11"/>
+    <entry key="animation-fill-mode" value="11"/>
+    <entry key="animation-iteration-count" value="11"/>
+    <entry key="animation-name" value="11"/>
+    <entry key="animation-play-state" value="11"/>
+    <entry key="animation-timing-function" value="11"/>
+    <entry key="appearance" value="3"/>
+    <entry key="backface-visibility" value="7"/>
+    <entry key="background-clip" value="3"/>
+    <entry key="background-composite" value="1"/>
+    <entry key="background-inline-policy" value="2"/>
+    <entry key="background-origin" value="1"/>
+    <entry key="background-position-x" value="4"/>
+    <entry key="background-position-y" value="4"/>
+    <entry key="background-size" value="1"/>
+    <entry key="behavior" value="4"/>
+    <entry key="binding" value="2"/>
+    <entry key="block-progression" value="4"/>
+    <entry key="border-bottom-colors" value="2"/>
+    <entry key="border-fit" value="1"/>
+    <entry key="border-horizontal-spacing" value="1"/>
+    <entry key="border-image" value="11"/>
+    <entry key="border-left-colors" value="2"/>
+    <entry key="border-radius" value="3"/>
+    <entry key="border-right-colors" value="2"/>
+    <entry key="border-top-colors" value="2"/>
+    <entry key="border-vertical-spacing" value="1"/>
+    <entry key="box-align" value="7"/>
+    <entry key="box-direction" value="7"/>
+    <entry key="box-flex" value="7"/>
+    <entry key="box-flex-group" value="1"/>
+    <entry key="box-line-progression" value="4"/>
+    <entry key="box-lines" value="5"/>
+    <entry key="box-ordinal-group" value="7"/>
+    <entry key="box-orient" value="7"/>
+    <entry key="box-pack" value="7"/>
+    <entry key="box-reflect" value="1"/>
+    <entry key="box-shadow" value="3"/>
+    <entry key="box-sizing" value="3"/>
+    <entry key="color-correction" value="1"/>
+    <entry key="column-break-after" value="1"/>
+    <entry key="column-break-before" value="1"/>
+    <entry key="column-break-inside" value="1"/>
+    <entry key="column-count" value="3"/>
+    <entry key="column-gap" value="3"/>
+    <entry key="column-rule-color" value="3"/>
+    <entry key="column-rule-style" value="3"/>
+    <entry key="column-rule-width" value="3"/>
+    <entry key="column-span" value="1"/>
+    <entry key="column-width" value="3"/>
+    <entry key="content-zoom-boundary" value="4"/>
+    <entry key="content-zoom-boundary-max" value="4"/>
+    <entry key="content-zoom-boundary-min" value="4"/>
+    <entry key="content-zoom-chaining" value="4"/>
+    <entry key="content-zoom-snap" value="4"/>
+    <entry key="content-zoom-snap-points" value="4"/>
+    <entry key="content-zoom-snap-type" value="4"/>
+    <entry key="content-zooming" value="4"/>
+    <entry key="dashboard-region" value="9"/>
+    <entry key="filter" value="4"/>
+    <entry key="float-edge" value="2"/>
+    <entry key="flow-from" value="4"/>
+    <entry key="flow-into" value="4"/>
+    <entry key="font-feature-settings" value="6"/>
+    <entry key="font-language-override" value="2"/>
+    <entry key="font-smoothing" value="1"/>
+    <entry key="force-broken-image-icon" value="2"/>
+    <entry key="grid-column" value="4"/>
+    <entry key="grid-column-align" value="4"/>
+    <entry key="grid-column-span" value="4"/>
+    <entry key="grid-columns" value="4"/>
+    <entry key="grid-layer" value="4"/>
+    <entry key="grid-row" value="4"/>
+    <entry key="grid-row-align" value="4"/>
+    <entry key="grid-row-span" value="4"/>
+    <entry key="grid-rows" value="4"/>
+    <entry key="high-contrast-adjust" value="4"/>
+    <entry key="highlight" value="1"/>
+    <entry key="hyphenate-character" value="1"/>
+    <entry key="hyphenate-limit-after" value="1"/>
+    <entry key="hyphenate-limit-before" value="1"/>
+    <entry key="hyphenate-limit-chars" value="4"/>
+    <entry key="hyphenate-limit-lines" value="4"/>
+    <entry key="hyphenate-limit-zone" value="4"/>
+    <entry key="hyphens" value="7"/>
+    <entry key="image-region" value="2"/>
+    <entry key="ime-mode" value="4"/>
+    <entry key="input-format" value="8"/>
+    <entry key="input-required" value="8"/>
+    <entry key="interpolation-mode" value="4"/>
+    <entry key="layout-flow" value="4"/>
+    <entry key="layout-grid" value="4"/>
+    <entry key="layout-grid-char" value="4"/>
+    <entry key="layout-grid-line" value="4"/>
+    <entry key="layout-grid-mode" value="4"/>
+    <entry key="layout-grid-type" value="4"/>
+    <entry key="line-box-contain" value="1"/>
+    <entry key="line-break" value="5"/>
+    <entry key="line-clamp" value="1"/>
+    <entry key="link" value="8"/>
+    <entry key="link-source" value="8"/>
+    <entry key="locale" value="1"/>
+    <entry key="margin-after-collapse" value="1"/>
+    <entry key="margin-before-collapse" value="1"/>
+    <entry key="marquee-dir" value="8"/>
+    <entry key="marquee-direction" value="1"/>
+    <entry key="marquee-increment" value="1"/>
+    <entry key="marquee-loop" value="8"/>
+    <entry key="marquee-repetition" value="1"/>
+    <entry key="marquee-speed" value="8"/>
+    <entry key="marquee-style" value="9"/>
+    <entry key="mask-attachment" value="1"/>
+    <entry key="mask-box-image" value="1"/>
+    <entry key="mask-box-image-outset" value="1"/>
+    <entry key="mask-box-image-repeat" value="1"/>
+    <entry key="mask-box-image-slice" value="1"/>
+    <entry key="mask-box-image-source" value="1"/>
+    <entry key="mask-box-image-width" value="1"/>
+    <entry key="mask-clip" value="1"/>
+    <entry key="mask-composite" value="1"/>
+    <entry key="mask-image" value="1"/>
+    <entry key="mask-origin" value="1"/>
+    <entry key="mask-position" value="1"/>
+    <entry key="mask-repeat" value="1"/>
+    <entry key="mask-size" value="1"/>
+    <entry key="nbsp-mode" value="1"/>
+    <entry key="object-fit" value="8"/>
+    <entry key="object-position" value="8"/>
+    <entry key="orient" value="2"/>
+    <entry key="outline-radius-bottomleft" value="2"/>
+    <entry key="outline-radius-bottomright" value="2"/>
+    <entry key="outline-radius-topleft" value="2"/>
+    <entry key="outline-radius-topright" value="2"/>
+    <entry key="overflow-style" value="4"/>
+    <entry key="perspective" value="7"/>
+    <entry key="perspective-origin" value="7"/>
+    <entry key="perspective-origin-x" value="4"/>
+    <entry key="perspective-origin-y" value="4"/>
+    <entry key="rtl-ordering" value="1"/>
+    <entry key="scroll-boundary" value="4"/>
+    <entry key="scroll-boundary-bottom" value="4"/>
+    <entry key="scroll-boundary-left" value="4"/>
+    <entry key="scroll-boundary-right" value="4"/>
+    <entry key="scroll-boundary-top" value="4"/>
+    <entry key="scroll-chaining" value="4"/>
+    <entry key="scroll-rails" value="4"/>
+    <entry key="scroll-snap-points-x" value="4"/>
+    <entry key="scroll-snap-points-y" value="4"/>
+    <entry key="scroll-snap-type" value="4"/>
+    <entry key="scroll-snap-x" value="4"/>
+    <entry key="scroll-snap-y" value="4"/>
+    <entry key="scrollbar-arrow-color" value="4"/>
+    <entry key="scrollbar-base-color" value="4"/>
+    <entry key="scrollbar-darkshadow-color" value="4"/>
+    <entry key="scrollbar-face-color" value="4"/>
+    <entry key="scrollbar-highlight-color" value="4"/>
+    <entry key="scrollbar-shadow-color" value="4"/>
+    <entry key="scrollbar-track-color" value="4"/>
+    <entry key="stack-sizing" value="2"/>
+    <entry key="svg-shadow" value="1"/>
+    <entry key="tab-size" value="10"/>
+    <entry key="table-baseline" value="8"/>
+    <entry key="text-align-last" value="4"/>
+    <entry key="text-autospace" value="4"/>
+    <entry key="text-blink" value="2"/>
+    <entry key="text-combine" value="1"/>
+    <entry key="text-decoration-color" value="2"/>
+    <entry key="text-decoration-line" value="2"/>
+    <entry key="text-decoration-style" value="2"/>
+    <entry key="text-decorations-in-effect" value="1"/>
+    <entry key="text-emphasis-color" value="1"/>
+    <entry key="text-emphasis-position" value="1"/>
+    <entry key="text-emphasis-style" value="1"/>
+    <entry key="text-fill-color" value="1"/>
+    <entry key="text-justify" value="4"/>
+    <entry key="text-kashida-space" value="4"/>
+    <entry key="text-orientation" value="1"/>
+    <entry key="text-overflow" value="4"/>
+    <entry key="text-security" value="1"/>
+    <entry key="text-size-adjust" value="6"/>
+    <entry key="text-stroke-color" value="1"/>
+    <entry key="text-stroke-width" value="1"/>
+    <entry key="text-underline-position" value="4"/>
+    <entry key="touch-action" value="4"/>
+    <entry key="transform" value="15"/>
+    <entry key="transform-origin" value="15"/>
+    <entry key="transform-origin-x" value="4"/>
+    <entry key="transform-origin-y" value="4"/>
+    <entry key="transform-origin-z" value="4"/>
+    <entry key="transform-style" value="7"/>
+    <entry key="transition" value="15"/>
+    <entry key="transition-delay" value="15"/>
+    <entry key="transition-duration" value="15"/>
+    <entry key="transition-property" value="15"/>
+    <entry key="transition-timing-function" value="15"/>
+    <entry key="user-drag" value="1"/>
+    <entry key="user-focus" value="2"/>
+    <entry key="user-input" value="2"/>
+    <entry key="user-modify" value="3"/>
+    <entry key="user-select" value="7"/>
+    <entry key="window-shadow" value="2"/>
+    <entry key="word-break" value="4"/>
+    <entry key="word-wrap" value="4"/>
+    <entry key="wrap-flow" value="4"/>
+    <entry key="wrap-margin" value="4"/>
+    <entry key="wrap-through" value="4"/>
+    <entry key="writing-mode" value="5"/>
+  </prefixes>
+</DefaultEmmetOptions>
\ No newline at end of file
diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java
index 9d114d27aad0..916f8f7eb730 100644
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FetchExtResourceAction.java
@@ -314,7 +314,7 @@ public class FetchExtResourceAction extends BaseExtResourceAction implements Wat
   }
 
   @Nullable
-  private static String fetchOneFile(final ProgressIndicator indicator,
+  private String fetchOneFile(final ProgressIndicator indicator,
                                      final String resourceUrl,
                                      final Project project,
                                      String extResourcesPath,
@@ -330,18 +330,7 @@ public class FetchExtResourceAction extends BaseExtResourceAction implements Wat
     FetchResult result = fetchData(project, resourceUrl, indicator);
     if (result == null) return null;
 
-    if (!ApplicationManager.getApplication().isUnitTestMode() &&
-        result.contentType != null &&
-        result.contentType.contains(HTML_MIME) &&
-        new String(result.bytes).contains("<html")) {
-      ApplicationManager.getApplication().invokeLater(new Runnable() {
-        public void run() {
-          Messages.showMessageDialog(project,
-                                     XmlBundle.message("invalid.url.no.xml.file.at.location", resourceUrl),
-                                     XmlBundle.message("invalid.url.title"),
-                                     Messages.getErrorIcon());
-        }
-      }, indicator.getModalityState());
+    if(!resultIsValid(project, indicator, resourceUrl, result)) {
       return null;
     }
 
@@ -366,7 +355,9 @@ public class FetchExtResourceAction extends BaseExtResourceAction implements Wat
     if (lastDoPosInResourceUrl == -1 ||
         FileTypeManager.getInstance().getFileTypeByExtension(resourceUrl.substring(lastDoPosInResourceUrl + 1)) == FileTypes.UNKNOWN) {
       // remote url does not contain file with extension
-      resPath += "." + StdFileTypes.XML.getDefaultExtension();
+      final String extension =
+        result.contentType.contains(HTML_MIME) ? StdFileTypes.HTML.getDefaultExtension() : StdFileTypes.XML.getDefaultExtension();
+      resPath += "." + extension;
     }
 
     File res = new File(resPath);
@@ -381,6 +372,24 @@ public class FetchExtResourceAction extends BaseExtResourceAction implements Wat
     return resPath;
   }
 
+  protected boolean resultIsValid(final Project project, ProgressIndicator indicator, final String resourceUrl, FetchResult result) {
+    if (!ApplicationManager.getApplication().isUnitTestMode() &&
+        result.contentType != null &&
+        result.contentType.contains(HTML_MIME) &&
+        new String(result.bytes).contains("<html")) {
+      ApplicationManager.getApplication().invokeLater(new Runnable() {
+        public void run() {
+          Messages.showMessageDialog(project,
+                                     XmlBundle.message("invalid.url.no.xml.file.at.location", resourceUrl),
+                                     XmlBundle.message("invalid.url.title"),
+                                     Messages.getErrorIcon());
+        }
+      }, indicator.getModalityState());
+      return false;
+    }
+    return true;
+  }
+
   private static List<String> extractEmbeddedFileReferences(XmlFile file, XmlFile context) {
     final List<String> result = new LinkedList<String>();
     if (context != null) {
@@ -474,7 +483,7 @@ public class FetchExtResourceAction extends BaseExtResourceAction implements Wat
     });
   }
 
-  static class FetchResult {
+  protected static class FetchResult {
     byte[] bytes;
     String contentType;
   }
diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetLexer.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetLexer.java
index 66aed8db6a72..b44963cabf19 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetLexer.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetLexer.java
@@ -16,6 +16,7 @@
 package com.intellij.codeInsight.template.emmet;
 
 import com.intellij.codeInsight.template.emmet.tokens.*;
+import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -89,8 +90,8 @@ public class EmmetLexer {
 
         if (builder.length() > 0) {
           final String tokenText = builder.toString();
-          final int n = ZenCodingUtil.parseNonNegativeInt(tokenText);
-          if (n >= 0) {
+          final int n = StringUtil.parseInt(tokenText, -1);
+          if (!StringUtil.startsWithChar(tokenText, '0') && n >= 0) {
             result.add(new NumberToken(n));
           }
           else {
diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java
index 6f4e29d58187..5d3ab8730412 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java
@@ -15,7 +15,7 @@
  */
 package com.intellij.codeInsight.template.emmet;
 
-import com.intellij.application.options.editor.WebEditorOptions;
+import com.intellij.application.options.emmet.EmmetOptions;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.template.*;
 import com.intellij.codeInsight.template.emmet.filters.SingleLineEmmetFilter;
@@ -276,8 +276,8 @@ public class ZenCodingTemplate implements CustomLiveTemplate {
   }
 
   public boolean isApplicable(PsiFile file, int offset, boolean wrapping) {
-    WebEditorOptions webEditorOptions = WebEditorOptions.getInstance();
-    if (!webEditorOptions.isZenCodingEnabled()) {
+    EmmetOptions emmetOptions = EmmetOptions.getInstance();
+    if (!emmetOptions.isEmmetEnabled()) {
       return false;
     }
     if (file == null) {
@@ -320,7 +320,7 @@ public class ZenCodingTemplate implements CustomLiveTemplate {
   }
 
   public char getShortcut() {
-    return (char)WebEditorOptions.getInstance().getZenCodingExpandShortcut();
+    return (char)EmmetOptions.getInstance().getEmmetExpandShortcut();
   }
 
   public String computeTemplateKey(@NotNull CustomTemplateCallback callback) {
diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingUtil.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingUtil.java
index 9b81e472680e..cb45efbee049 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingUtil.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingUtil.java
@@ -20,6 +20,7 @@ import com.intellij.codeInsight.template.emmet.filters.ZenCodingFilter;
 import com.intellij.codeInsight.template.emmet.generators.ZenCodingGenerator;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.openapi.util.text.StringUtil;
 import org.apache.xerces.util.XML11Char;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -67,7 +68,7 @@ public class ZenCodingUtil {
               base.append(s.charAt(i));
               i++;
             }
-            int baseInt = parseNonNegativeInt(base.toString()) - 1;
+            int baseInt = StringUtil.parseInt(base.toString(), 0) - 1;
             baseInt = baseInt >= 0 ? baseInt : 0;
             if(baseInt >= 0) {
               int byInt = decrement
@@ -104,15 +105,6 @@ public class ZenCodingUtil {
     return s.replace("\"", "&quot;");
   }
 
-  public static int parseNonNegativeInt(@NotNull String s) {
-    try {
-      return Integer.parseInt(s);
-    }
-    catch (Throwable ignored) {
-    }
-    return -1;
-  }
-
   public static boolean isXML11ValidQName(String str) {
     final int colon = str.indexOf(':');
     if (colon == 0 || colon == str.length() - 1) {
diff --git a/xml/impl/src/com/intellij/codeInsight/template/emmet/filters/BemEmmetFilter.java b/xml/impl/src/com/intellij/codeInsight/template/emmet/filters/BemEmmetFilter.java
index f226864dd2c1..69b1adf67d8f 100644
--- a/xml/impl/src/com/intellij/codeInsight/template/emmet/filters/BemEmmetFilter.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/emmet/filters/BemEmmetFilter.java
@@ -20,6 +20,7 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Predicate;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableSet;
+import com.intellij.application.options.emmet.EmmetOptions;
 import com.intellij.codeInsight.template.emmet.nodes.GenerationNode;
 import com.intellij.lang.xml.XMLLanguage;
 import com.intellij.openapi.util.Key;
@@ -94,7 +95,7 @@ public class BemEmmetFilter extends ZenCodingFilter {
 
   @Override
   public boolean isAppliedByDefault(@NotNull PsiElement context) {
-    return false; //todo: add setting for enabling this filter by default
+    return EmmetOptions.getInstance().isBemFilterEnabledByDefault();
   }
 
   @Override
diff --git a/xml/impl/src/com/intellij/html/impl/MicrodataAttributeDescriptorsProvider.java b/xml/impl/src/com/intellij/html/impl/MicrodataAttributeDescriptorsProvider.java
new file mode 100644
index 000000000000..319ae1a9d5b4
--- /dev/null
+++ b/xml/impl/src/com/intellij/html/impl/MicrodataAttributeDescriptorsProvider.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.html.impl;
+
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.xml.XmlAttribute;
+import com.intellij.psi.xml.XmlAttributeValue;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.util.ArrayUtil;
+import com.intellij.xml.XmlAttributeDescriptor;
+import com.intellij.xml.XmlAttributeDescriptorsProvider;
+import com.intellij.xml.impl.schema.AnyXmlAttributeDescriptor;
+import com.intellij.xml.util.HtmlUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.intellij.html.impl.util.MicrodataUtil.*;
+
+/**
+ * @author: Fedor.Korotkov
+ */
+public class MicrodataAttributeDescriptorsProvider implements XmlAttributeDescriptorsProvider {
+  @Override
+  public XmlAttributeDescriptor[] getAttributeDescriptors(XmlTag context) {
+    if (!HtmlUtil.isHtml5Context(context)) {
+      return XmlAttributeDescriptor.EMPTY;
+    }
+    final String tagName = context.getName();
+    List<XmlAttributeDescriptor> result = new ArrayList<XmlAttributeDescriptor>();
+    final boolean goodContextForProps =
+      "div".equalsIgnoreCase(tagName) || "span".equalsIgnoreCase(tagName) || "a".equalsIgnoreCase(tagName);
+    if (goodContextForProps && hasScopeTag(context)) {
+      result.add(new MicrodataPropertyAttributeDescriptor(context));
+    }
+    if (context.getAttribute(ITEM_SCOPE) == null) {
+      result.add(new AnyXmlAttributeDescriptor(ITEM_SCOPE));
+    }
+    else {
+      result.add(new XmlAttributeDescriptorWithEmptyDefaultValue(ITEM_ID));
+      result.add(new XmlAttributeDescriptorWithEmptyDefaultValue(ITEM_TYPE));
+      result.add(new XmlAttributeDescriptorWithEmptyDefaultValue(ITEM_REF));
+    }
+    return result.toArray(new XmlAttributeDescriptor[result.size()]);
+  }
+
+  @Nullable
+  @Override
+  public XmlAttributeDescriptor getAttributeDescriptor(String attributeName, XmlTag context) {
+    if (!HtmlUtil.isHtml5Context(context)) {
+      return null;
+    }
+    if (ITEM_SCOPE.equalsIgnoreCase(attributeName)) {
+      return new AnyXmlAttributeDescriptor(attributeName);
+    }
+    if (context.getAttribute(ITEM_SCOPE) != null &&
+        (ITEM_TYPE.equalsIgnoreCase(attributeName) || ITEM_ID.equalsIgnoreCase(attributeName) || ITEM_REF.equalsIgnoreCase(attributeName))) {
+      return new XmlAttributeDescriptorWithEmptyDefaultValue(attributeName);
+    }
+    if (ITEM_PROP.equalsIgnoreCase(attributeName) && hasScopeTag(context)) {
+      return new MicrodataPropertyAttributeDescriptor(context);
+    }
+    return null;
+  }
+
+  private static class XmlAttributeDescriptorWithEmptyDefaultValue extends AnyXmlAttributeDescriptor {
+    public XmlAttributeDescriptorWithEmptyDefaultValue(String name) {
+      super(name);
+    }
+
+    @Override
+    public String getDefaultValue() {
+      return "";
+    }
+  }
+
+  private static class MicrodataPropertyAttributeDescriptor extends AnyXmlAttributeDescriptor {
+
+    @NotNull
+    private final XmlTag myContext;
+
+    public MicrodataPropertyAttributeDescriptor(@NotNull XmlTag context) {
+      super(ITEM_PROP);
+      myContext = context;
+    }
+
+    @Override
+    public String getDefaultValue() {
+      return "";
+    }
+
+    @Override
+    public boolean isEnumerated() {
+      final String[] enumeratedValues = getEnumeratedValues();
+      return enumeratedValues == null ? super.isEnumerated() : enumeratedValues.length > 0;
+    }
+
+    @Override
+    public String[] getEnumeratedValues() {
+      final XmlTag scopeParent = findScopeTag(myContext.getParentTag());
+      return scopeParent != null ? findProperties(scopeParent) : super.getEnumeratedValues();
+    }
+
+    private static String[] findProperties(@NotNull XmlTag tag) {
+      final XmlAttribute typeAttribute = tag.getAttribute(ITEM_TYPE);
+      if (typeAttribute != null) {
+        final XmlAttributeValue valueElement = typeAttribute.getValueElement();
+        final PsiReference[] references = valueElement != null ? valueElement.getReferences() : PsiReference.EMPTY_ARRAY;
+        List<String> result = new ArrayList<String>();
+        for (PsiReference reference : references) {
+          final PsiElement target = reference != null ? reference.resolve() : null;
+          if (target instanceof PsiFile) {
+            result.addAll(extractProperties((PsiFile)target, StringUtil.stripQuotesAroundValue(reference.getCanonicalText())));
+          }
+        }
+        return ArrayUtil.toStringArray(result);
+      }
+      return ArrayUtil.EMPTY_STRING_ARRAY;
+    }
+  }
+}
diff --git a/xml/impl/src/com/intellij/html/impl/providers/MicrodataReferenceProvider.java b/xml/impl/src/com/intellij/html/impl/providers/MicrodataReferenceProvider.java
new file mode 100644
index 000000000000..27fd3d2286b3
--- /dev/null
+++ b/xml/impl/src/com/intellij/html/impl/providers/MicrodataReferenceProvider.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.html.impl.providers;
+
+import com.intellij.html.impl.util.MicrodataUtil;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.PsiReferenceProvider;
+import com.intellij.psi.xml.XmlAttributeValue;
+import com.intellij.util.ProcessingContext;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author: Fedor.Korotkov
+ */
+public class MicrodataReferenceProvider extends PsiReferenceProvider {
+  @NotNull
+  @Override
+  public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
+    return element instanceof XmlAttributeValue ?
+           MicrodataUtil.getUrlReferencesForAttributeValue((XmlAttributeValue)element) :
+           PsiReference.EMPTY_ARRAY;
+  }
+}
diff --git a/xml/impl/src/com/intellij/html/impl/util/MicrodataUtil.java b/xml/impl/src/com/intellij/html/impl/util/MicrodataUtil.java
new file mode 100644
index 000000000000..5467388e914a
--- /dev/null
+++ b/xml/impl/src/com/intellij/html/impl/util/MicrodataUtil.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.html.impl.util;
+
+import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.codeInsight.daemon.impl.quickfix.FetchExtResourceAction;
+import com.intellij.codeInsight.daemon.impl.quickfix.IgnoreExtResourceAction;
+import com.intellij.codeInsight.daemon.impl.quickfix.ManuallySetupExtResourceAction;
+import com.intellij.codeInsight.daemon.impl.quickfix.QuickFixAction;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.XmlRecursiveElementVisitor;
+import com.intellij.psi.impl.source.resolve.reference.impl.providers.URIReferenceProvider;
+import com.intellij.psi.impl.source.resolve.reference.impl.providers.URLReference;
+import com.intellij.psi.xml.XmlAttribute;
+import com.intellij.psi.xml.XmlAttributeValue;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.util.PairFunction;
+import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.text.StringTokenizer;
+import gnu.trove.THashSet;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author: Fedor.Korotkov
+ */
+public class MicrodataUtil {
+  public static final Key<List<String>> ITEM_PROP_KEYS = Key.create("microdata.prop");
+  public static final String ITEM_REF = "itemref";
+  public static final String ITEM_SCOPE = "itemscope";
+  public static final String ITEM_TYPE = "itemtype";
+  public static final String ITEM_PROP = "itemprop";
+  public static final String ITEM_ID = "itemid";
+
+  @NonNls private static final String HTTP = "http://";
+  @NonNls private static final String HTTPS = "https://";
+
+  public static boolean hasScopeTag(@Nullable XmlTag tag) {
+    return findScopeTag(tag) != null;
+  }
+
+  @Nullable
+  public static XmlTag findScopeTag(@Nullable XmlTag tag) {
+    while (tag != null) {
+      if (tag.getAttribute(ITEM_SCOPE) != null) return tag;
+      XmlTag scopeTag = findInRefsById(tag);
+      if (scopeTag != null) return scopeTag;
+      tag = tag.getParentTag();
+    }
+    return null;
+  }
+
+  @Nullable
+  private static XmlTag findInRefsById(XmlTag tag) {
+    XmlAttribute idAttr = tag.getAttribute("id");
+    final XmlAttributeValue idValue = idAttr != null ? idAttr.getValueElement() : null;
+    if (idValue == null) {
+      return null;
+    }
+    final String idToFind = StringUtil.stripQuotesAroundValue(idValue.getText());
+    XmlTag parentTag = tag.getParentTag();
+    while (parentTag != null) {
+      XmlTag scopeTag = ContainerUtil.find(parentTag.getSubTags(), new Condition<XmlTag>() {
+        @Override
+        public boolean value(XmlTag tag) {
+          String refValue = tag.getAttributeValue(ITEM_REF);
+          return refValue != null && refValue.contains(idToFind);
+        }
+      });
+      if (scopeTag != null) {
+        return scopeTag;
+      }
+      parentTag = parentTag.getParentTag();
+    }
+    return null;
+  }
+
+  public static List<String> extractProperties(PsiFile file, String type) {
+    final VirtualFile virtualFile = file.getVirtualFile();
+    List<String> result = virtualFile != null ? virtualFile.getUserData(ITEM_PROP_KEYS) : null;
+    if (virtualFile != null && result == null) {
+      result = collectNames(file, type);
+      virtualFile.putUserData(ITEM_PROP_KEYS, result);
+    }
+    return result;
+  }
+
+  private static List<String> collectNames(PsiFile file, String type) {
+    if (file instanceof XmlFile) {
+      final CollectNamesVisitor collectNamesVisitor = getVisitorByType(type);
+      file.accept(collectNamesVisitor);
+      return collectNamesVisitor.getValues();
+    }
+    return Collections.emptyList();
+  }
+
+  private static CollectNamesVisitor getVisitorByType(String type) {
+    if (type.contains("schema.org")) {
+      return new CollectNamesFromSchemaOrgVisitor();
+    }
+    return new CollectNamesByMicrodataVisitor(type);
+  }
+
+  public static PsiReference[] getUrlReferencesForAttributeValue(final XmlAttributeValue element) {
+    return getReferencesForAttributeValue(element, new PairFunction<String, Integer, PsiReference>() {
+      @Nullable
+      @Override
+      public PsiReference fun(String token, Integer offset) {
+        if (isUrl(token)) {
+          final TextRange range = TextRange.from(offset, token.length());
+          final URLReference urlReference = new URLReference(element, range, true);
+          return new URIReferenceProvider.DependentNSReference(element, range, urlReference) {
+            @Override
+            public void registerQuickfix(HighlightInfo info, PsiReference reference) {
+              QuickFixAction.registerQuickFixAction(info, new FetchMicrodataResourceAction());
+              QuickFixAction.registerQuickFixAction(info, new ManuallySetupExtResourceAction());
+              QuickFixAction.registerQuickFixAction(info, new IgnoreExtResourceAction());
+            }
+          };
+        }
+        return null;
+      }
+    });
+  }
+
+  public static PsiReference[] getReferencesForAttributeValue(XmlAttributeValue element,
+                                                              PairFunction<String, Integer, PsiReference> refFun) {
+    String text = element.getText();
+    String urls = StringUtil.stripQuotesAroundValue(text);
+    StringTokenizer tokenizer = new StringTokenizer(urls);
+    List<PsiReference> result = new ArrayList<PsiReference>();
+    while (tokenizer.hasMoreTokens()) {
+      String token = tokenizer.nextToken();
+      int index = text.indexOf(token);
+      PsiReference ref = refFun.fun(token, index);
+      if (ref != null) {
+        result.add(ref);
+      }
+    }
+    return result.toArray(new PsiReference[result.size()]);
+  }
+
+  private static boolean isUrl(String url) {
+    return url.startsWith(HTTP) || url.startsWith(HTTPS);
+  }
+
+  @Nullable
+  public static String getStripedAttributeValue(@Nullable XmlTag tag, @Nls String attributeName) {
+    String value = tag != null ? tag.getAttributeValue(attributeName) : null;
+    return value != null ? StringUtil.stripQuotesAroundValue(value) : null;
+  }
+
+  private static class CollectNamesVisitor extends XmlRecursiveElementVisitor {
+    protected final Set<String> myValues = new THashSet<String>();
+
+    public List<String> getValues() {
+      return new ArrayList<String>(myValues);
+    }
+  }
+
+  public static class CollectNamesByMicrodataVisitor extends CollectNamesVisitor {
+    protected final String myType;
+    private boolean myCollecting = false;
+
+    public CollectNamesByMicrodataVisitor(String type) {
+      myType = type;
+    }
+
+    @Override
+    public void visitXmlTag(XmlTag tag) {
+      String value = getStripedAttributeValue(tag, ITEM_ID);
+      final boolean isTypeTag = myType.equalsIgnoreCase(value);
+      if (isTypeTag) {
+        myCollecting = true;
+      }
+
+      if (myCollecting && "name".equalsIgnoreCase(getStripedAttributeValue(tag, ITEM_PROP))) {
+        myValues.add(tag.getValue().getTrimmedText());
+      }
+
+      super.visitXmlTag(tag);
+
+      if (isTypeTag) {
+        myCollecting = false;
+      }
+    }
+  }
+
+  public static class CollectNamesFromSchemaOrgVisitor extends CollectNamesVisitor {
+    @Override
+    public void visitXmlTag(XmlTag tag) {
+      super.visitXmlTag(tag);
+      if ("prop-nam".equalsIgnoreCase(getStripedAttributeValue(tag, "class"))) {
+        final String code = tag.getSubTagText("code");
+        if (code != null) {
+          myValues.add(code);
+        }
+      }
+    }
+  }
+
+  private static class FetchMicrodataResourceAction extends FetchExtResourceAction {
+    @Override
+    protected boolean resultIsValid(Project project,
+                                    ProgressIndicator indicator,
+                                    String resourceUrl,
+                                    FetchExtResourceAction.FetchResult result) {
+      return true;
+    }
+  }
+}
diff --git a/xml/impl/src/com/intellij/refactoring/XmlImportOptimizer.java b/xml/impl/src/com/intellij/refactoring/XmlImportOptimizer.java
index 3803b16057ec..d27dc2bb95b5 100644
--- a/xml/impl/src/com/intellij/refactoring/XmlImportOptimizer.java
+++ b/xml/impl/src/com/intellij/refactoring/XmlImportOptimizer.java
@@ -21,6 +21,8 @@ import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.codeInspection.QuickFix;
 import com.intellij.lang.ImportOptimizer;
+import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Condition;
 import com.intellij.psi.*;
@@ -40,6 +42,7 @@ import java.util.Map;
  *         Date: 11/7/11
  */
 public class XmlImportOptimizer implements ImportOptimizer {
+  public static final ExtensionPointName<ImportOptimizer> EP_NAME = ExtensionPointName.create("com.intellij.xml.importOptimizer");
 
   private final XmlUnusedNamespaceInspection myInspection = new XmlUnusedNamespaceInspection();
   private final Condition<ProblemDescriptor> myCondition = new Condition<ProblemDescriptor>() {
@@ -59,6 +62,11 @@ public class XmlImportOptimizer implements ImportOptimizer {
   @NotNull
   @Override
   public Runnable processFile(final PsiFile file) {
+    for (ImportOptimizer optimizer : Extensions.getExtensions(EP_NAME)) {
+      if (optimizer.supports(file)) {
+        return optimizer.processFile(file);
+      }
+    }
     return new Runnable() {
       @Override
       public void run() {
diff --git a/xml/impl/src/com/intellij/xml/util/ColorIconCache.java b/xml/impl/src/com/intellij/xml/util/ColorIconCache.java
index 15b31716e5ca..c0f01ad354eb 100644
--- a/xml/impl/src/com/intellij/xml/util/ColorIconCache.java
+++ b/xml/impl/src/com/intellij/xml/util/ColorIconCache.java
@@ -17,7 +17,6 @@ package com.intellij.xml.util;
 
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.SoftFactoryMap;
-import com.intellij.util.containers.WeakFactoryMap;
 import com.intellij.util.ui.EmptyIcon;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,7 +43,6 @@ public class ColorIconCache {
     return INSTANCE;
   }
 
-  @SuppressWarnings({"MethodMayBeStatic"})
   public Icon getIcon(@NotNull final Color color, final int size) {
     Icon icon = ourCache.get(color).get(size);
     if (icon == null) {
diff --git a/xml/impl/src/com/intellij/xml/util/XmlReferenceContributor.java b/xml/impl/src/com/intellij/xml/util/XmlReferenceContributor.java
index 872d17462e20..6b68974f4ecc 100644
--- a/xml/impl/src/com/intellij/xml/util/XmlReferenceContributor.java
+++ b/xml/impl/src/com/intellij/xml/util/XmlReferenceContributor.java
@@ -1,6 +1,8 @@
 package com.intellij.xml.util;
 
 import com.intellij.codeInsight.daemon.impl.analysis.encoding.XmlEncodingReferenceProvider;
+import com.intellij.html.impl.providers.MicrodataReferenceProvider;
+import com.intellij.html.impl.util.MicrodataUtil;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.patterns.XmlPatterns;
 import com.intellij.psi.PsiReferenceContributor;
@@ -52,6 +54,13 @@ public class XmlReferenceContributor extends PsiReferenceContributor {
       )
     ), true, uriProvider);
 
+    XmlUtil.registerXmlAttributeValueReferenceProvider(
+      registrar,
+      new String[]{MicrodataUtil.ITEM_TYPE},
+      null,
+      new MicrodataReferenceProvider()
+    );
+
     final SchemaReferencesProvider schemaReferencesProvider = new SchemaReferencesProvider();
 
     XmlUtil.registerXmlAttributeValueReferenceProvider(registrar,
diff --git a/xml/tests/src/com/intellij/html/MicrodataCompletionTest.java b/xml/tests/src/com/intellij/html/MicrodataCompletionTest.java
new file mode 100644
index 000000000000..d621b286d092
--- /dev/null
+++ b/xml/tests/src/com/intellij/html/MicrodataCompletionTest.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.html;
+
+import com.intellij.codeInsight.completion.CompletionType;
+import com.intellij.javaee.ExternalResourceManager;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author: Fedor.Korotkov
+ */
+public class MicrodataCompletionTest extends CodeInsightFixtureTestCase {
+
+  @Override
+  protected String getBasePath() {
+    return "/xml/tests/testData/microdata/";
+  }
+
+  @Override
+  protected boolean isCommunity() {
+    return true;
+  }
+
+  private void doTestInHtml(String text, String... items) throws Throwable {
+    configureAndComplete(text, items);
+    assertContainsElements(myFixture.getLookupElementStrings(), Arrays.asList(items));
+  }
+
+  private void doFailTestInHtml(String text, String... items) throws Throwable {
+    configureAndComplete(text, items);
+    final List<String> lookups = myFixture.getLookupElementStrings();
+    assertNotNull(lookups);
+    for (String item : items) {
+      assertFalse("Should not contain: " + item, lookups.contains(item));
+    }
+  }
+
+  private void configureAndComplete(String text, String[] items) throws Exception {
+    myFixture.configureByText(StdFileTypes.HTML, text);
+    myFixture.complete(CompletionType.BASIC);
+  }
+
+  public void testScopeType() throws Throwable {
+    doTestInHtml("<section <caret>></section>", "itemscope");
+  }
+
+  public void testScopeInDivTag() throws Throwable {
+    doTestInHtml("<div <caret>></div>", "itemscope");
+  }
+
+  public void testScopeInSpanTag() throws Throwable {
+    doTestInHtml("<span <caret>></span>", "itemscope");
+  }
+
+  public void testScopeInATag() throws Throwable {
+    doTestInHtml("<a <caret>></a>", "itemscope");
+  }
+
+  public void testTypeInATag() throws Throwable {
+    doFailTestInHtml("<a <caret>></a>", "itemtype", "itemid");
+  }
+
+  public void testTypeInScope() throws Throwable {
+    doTestInHtml("<section itemscope <caret>><div></div></section>", "itemtype", "itemid");
+  }
+
+  public void testPropInScope() throws Throwable {
+    doTestInHtml("<section itemscope><div <caret>></div></section>", "itemprop");
+  }
+
+  public void testTypeWithinScope() throws Throwable {
+    doFailTestInHtml("<section <caret>><div></div></section>", "itemtype", "itemid");
+  }
+
+  public void testPropWithinScope() throws Throwable {
+    doFailTestInHtml("<section><div <caret>></div></section>", "itemprop");
+  }
+
+  public void testPropWithinScopeWithRef() throws Throwable {
+    doTestInHtml("<body>" +
+                 "<section itemscope itemref=\"bar foo\"></section>" +
+                 "<section id=\"foo\"><div <caret>></div></section>" +
+                 "</body>", "itemprop");
+  }
+
+  public void testRefInScope() throws Throwable {
+    doTestInHtml("<section itemscope itemref=\"b<caret>\"></section><p id=\"bar\"></p><p id=\"baz\"></p>", "bar", "baz");
+  }
+
+  public void testPropValue() throws Throwable {
+    final VirtualFile virtualFile = myFixture.copyFileToProject("Person.html");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        ExternalResourceManager.getInstance().addResource("http://data-vocabulary.org/Person", virtualFile.getPath());
+      }
+    });
+    doTestInHtml("<section itemscope itemtype=\"http://data-vocabulary.org/Person\"><div itemprop=\"<caret>\"></div></section>",
+                 "name", "nickname", "photo", "title", "role", "url", "affiliation", "friend", "acquaintance", "address"
+    );
+  }
+
+  public void testPropValueSchemaOrgFormat() throws Throwable {
+    final VirtualFile virtualFile = myFixture.copyFileToProject("Product.html");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        ExternalResourceManager.getInstance().addResource("http://schema.org/Product", virtualFile.getPath());
+      }
+    });
+    doTestInHtml("<section itemscope itemtype=\"http://schema.org/Product\"><div itemprop=\"<caret>\"></div></section>",
+                 "additionalType",
+                 "aggregateRating",
+                 "brand",
+                 "color",
+                 "depth",
+                 "description",
+                 "gtin13",
+                 "gtin14",
+                 "gtin8",
+                 "height",
+                 "image",
+                 "isAccessoryOrSparePartFor",
+                 "isConsumableFor",
+                 "isRelatedTo",
+                 "isSimilarTo",
+                 "itemCondition",
+                 "logo",
+                 "manufacturer",
+                 "model",
+                 "mpn",
+                 "name",
+                 "offers",
+                 "productID",
+                 "releaseDate",
+                 "review",
+                 "reviews",
+                 "sku",
+                 "url",
+                 "weight",
+                 "width"
+    );
+  }
+
+  public void testPropValueFromTwoTypes() throws Throwable {
+    final VirtualFile personFile = myFixture.copyFileToProject("Person.html");
+    final VirtualFile addressFile = myFixture.copyFileToProject("Address.html");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        ExternalResourceManager.getInstance().addResource("http://data-vocabulary.org/Person", personFile.getPath());
+        ExternalResourceManager.getInstance().addResource("http://data-vocabulary.org/Address", addressFile.getPath());
+      }
+    });
+    doTestInHtml(
+      "<section itemscope itemtype=\"http://data-vocabulary.org/Person http://data-vocabulary.org/Address\"><div itemprop=\"<caret>\"></div></section>",
+      "name", "nickname", "photo", "title", "role", "url", "affiliation", "friend", "acquaintance", "address",
+      "street-address", "locality", "region", "postal-code", "country-name"
+    );
+  }
+
+  public void testPropValueFromRef() throws Throwable {
+    final VirtualFile virtualFile = myFixture.copyFileToProject("Person.html");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        ExternalResourceManager.getInstance().addResource("http://data-vocabulary.org/Person", virtualFile.getPath());
+      }
+    });
+    doTestInHtml("<body>" +
+                 "<section itemscope itemtype=\"http://data-vocabulary.org/Person\" itemref=\"foo\"></section>" +
+                 "<section id=\"foo\"><div itemprop=\"<caret>\"></div></section>" +
+                 "</body>",
+                 "name", "nickname", "photo", "title", "role", "url", "affiliation", "friend", "acquaintance", "address"
+    );
+  }
+
+  public void testPropValueNestedScopes() throws Throwable {
+    final VirtualFile personFile = myFixture.copyFileToProject("Person.html");
+    final VirtualFile addressFile = myFixture.copyFileToProject("Address.html");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        ExternalResourceManager.getInstance().addResource("http://data-vocabulary.org/Person", personFile.getPath());
+        ExternalResourceManager.getInstance().addResource("http://data-vocabulary.org/Address", addressFile.getPath());
+      }
+    });
+    doTestInHtml("<div itemscope itemtype=\"http://data-vocabulary.org/Person\">\n" +
+                 "    My name is <span itemprop=\"name\">Smith</span>\n" +
+                 "    <span itemprop=\"<caret>\" itemscope itemtype=\"http://data-vocabulary.org/Address\">\n" +
+                 "        <span itemprop=\"locality\">Albuquerque</span>\n" +
+                 "        <span itemprop=\"region\">NM</span>\n" +
+                 "    </span>\n" +
+                 "</div>",
+                 "name", "nickname", "photo", "title", "role", "url", "affiliation", "friend", "acquaintance", "address"
+    );
+  }
+}
diff --git a/xml/tests/testData/microdata/Address.html b/xml/tests/testData/microdata/Address.html
new file mode 100644
index 000000000000..4e926bb53ccf
--- /dev/null
+++ b/xml/tests/testData/microdata/Address.html
@@ -0,0 +1,105 @@
+
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>
+      Address microdata description · Data-Vocabulary.org
+    </title>
+    <link href="/css/default.css" rel="stylesheet">
+    <script src="//www.google.com/js/gweb/analytics/autotrack.js">
+</script>
+    <script>
+new gweb.analytics.AutoTrack({profile: 'UA-12481063-1'});
+    </script>
+  </head>
+  <body>
+    <h1>
+      <a href="/">Data-Vocabulary.org</a>
+    </h1>
+    <h2>
+      Address
+    </h2>
+    <ul id="promo">
+      <li>Looking for Google’s <a href=
+      "http://google.com/support/webmasters/bin/answer.py?answer=99170">webmaster docs</a>?
+      </li>
+      <li>Looking for <a href="http://rdf.data-vocabulary.org/">RDF</a>?
+      </li>
+    </ul>
+    <div itemid="http://data-vocabulary.org/Address" itemscope itemtype=
+    "http://data-vocabulary.org/itemtype">
+      <p>
+        See our <a href=
+        "http://www.google.com/support/webmasters/bin/answer.py?hl=en&amp;answer=146861">Businesses
+        and Organizations webmaster docs</a> for a full explanation of the Address type, and how to
+        encode Address data in RDFa, microformats or microdata. This page exists to contain a
+        machine-readable microdata description of the Address type itself (at the URI
+        http://data-vocabulary.org/Address).
+      </p>
+      <p>
+        An item with the <a href=
+        "http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.html#item-type">item
+        type</a> http://data-vocabulary.org/Address represents a physical address. The following
+        are the type’s <a href=
+        "http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.html#defined-property-name">
+        defined property names</a>:
+      </p>
+      <table>
+        <tr>
+          <th>
+            Property
+          </th>
+          <th>
+            Description
+          </th>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Address/street-address" itemprop="itemprop"
+        itemscope itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">street-address</code>
+          </td>
+          <td itemprop="description">
+            The street address.
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Address/locality" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">locality</code>
+          </td>
+          <td itemprop="description">
+            The locality (e.g., a city).
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Address/region" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">region</code>
+          </td>
+          <td itemprop="description">
+            The region (e.g., a state).
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Address/postal-code" itemprop="itemprop" itemscope=
+        "" itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">postal-code</code>
+          </td>
+          <td itemprop="description">
+            The postal code.
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Address/country-name" itemprop="itemprop" itemscope=
+        "" itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">country-name</code>
+          </td>
+          <td itemprop="description">
+            The name of the country.
+          </td>
+        </tr>
+      </table>
+    </div>
+  </body>
+</html>
diff --git a/xml/tests/testData/microdata/Person.html b/xml/tests/testData/microdata/Person.html
new file mode 100644
index 000000000000..225560b6984d
--- /dev/null
+++ b/xml/tests/testData/microdata/Person.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>
+      Person microdata description · Data-Vocabulary.org
+    </title>
+    <link href="/css/default.css" rel="stylesheet">
+    <script src="//www.google.com/js/gweb/analytics/autotrack.js">
+</script>
+    <script>
+new gweb.analytics.AutoTrack({profile: 'UA-12481063-1'});
+    </script>
+  </head>
+  <body>
+    <h1>
+      <a href="/">Data-Vocabulary.org</a>
+    </h1>
+    <h2>
+      Person
+    </h2>
+    <ul id="promo">
+      <li>Looking for Google’s <a href=
+      "http://google.com/support/webmasters/bin/answer.py?answer=99170">webmaster docs</a>?
+      </li>
+      <li>Looking for <a href="http://rdf.data-vocabulary.org/">RDF</a>?
+      </li>
+    </ul>
+    <div itemid="http://data-vocabulary.org/Person" itemscope itemtype=
+    "http://data-vocabulary.org/itemtype">
+      <p>
+        See our <a href=
+        "http://www.google.com/support/webmasters/bin/answer.py?hl=en&amp;answer=146646">Person
+        webmaster docs</a> for full explanation of the Person type, and how to encode Person data
+        in RDFa, microformats or microdata. This page exists to contain a machine-readable
+        microdata description of the Person type itself (at the URI
+        http://data-vocabulary.org/Person).
+      </p>
+      <p>
+        An item with the <a href=
+        "http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.html#item-type">item
+        type</a> http://data-vocabulary.org/Person represents a person. The following are the
+        type’s <a href=
+        "http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.html#defined-property-name">
+        defined property names</a>:
+      </p>
+      <table>
+        <tr>
+          <th>
+            Property
+          </th>
+          <th>
+            Description
+          </th>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Person/name" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">name</code> (<code>fn</code>)
+          </td>
+          <td itemprop="description">
+            Name.
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Person/nickname" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">nickname</code>
+          </td>
+          <td itemprop="description">
+            Nickname.
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Person/photo" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">photo</code>
+          </td>
+          <td itemprop="description">
+            An image link.
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Person/title" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">title</code>
+          </td>
+          <td itemprop="description">
+            The person’s title (for example, Financial Manager).
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Person/role" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">role</code>
+          </td>
+          <td itemprop="description">
+            The person’s role (for example, Accountant).
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Person/url" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">url</code>
+          </td>
+          <td itemprop="description">
+            Link to a web page, such as the person’s home page.
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Person/affiliation" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">affiliation</code> (<code>org</code>)
+          </td>
+          <td itemprop="description">
+            The name of an organization with which the person is associated (for example, an
+            employer). If <code>fn</code> and <code>org</code> have the exact same value, Google
+            will interpret the information as referring to a business or organization, not a
+            person.
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Person/friend" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">friend</code>
+          </td>
+          <td itemprop="description">
+            Identifies a social relationship between the person described and another person.
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Person/contact" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">contact</code>
+          </td>
+          <td itemprop="description">
+            Identifies a social relationship between the person described and another person.
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Person/acquaintance" itemprop="itemprop" itemscope=
+        "" itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">acquaintance</code>
+          </td>
+          <td itemprop="description">
+            Identifies a social relationship between the person described and another person.
+          </td>
+        </tr>
+        <tr itemid="http://data-vocabulary.org/Person/address" itemprop="itemprop" itemscope
+        itemtype="http://data-vocabulary.org/itemprop">
+          <td>
+            <code itemprop="name">address</code> (<code>adr</code>)
+          </td>
+          <td itemprop="description">
+            The location of the person. Can have the subproperties <code>street-address</code>,
+            <code>locality</code>, <code>region</code>, <code>postal-code</code>, and
+            <code>country-name</code>.
+          </td>
+        </tr>
+      </table>
+    </div>
+  </body>
+</html>
diff --git a/xml/tests/testData/microdata/Product.html b/xml/tests/testData/microdata/Product.html
new file mode 100644
index 000000000000..f8fac536ee77
--- /dev/null
+++ b/xml/tests/testData/microdata/Product.html
@@ -0,0 +1,706 @@
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Product  - schema.org</title>
+
+    <meta name="description" content="Schema.org is a set of extensible
+    schemas that enables webmasters to embed
+    structured data on their web pages for use by search engines and
+    other applications.">
+    <link rel="stylesheet" type="text/css"
+          href="search_files/schemaorg.css">
+
+    <link href="search_files/prettify.css" type="text/css"
+          rel="stylesheet" />
+    <script type="text/javascript" src="js/prettify.js">
+    </script>
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
+
+<script type="text/javascript">
+      $(document).ready(function(){
+        prettyPrint();
+        setTimeout(function(){
+
+  $(".atn:contains(itemscope), .atn:contains(itemtype), .atn:contains(itemprop), .atn:contains(itemid), .atn:contains(time), .atn:contains(datetime), .atn:contains(datetime), .tag:contains(time) ").addClass('new');
+  $('.new + .pun + .atv').addClass('curl');
+
+        }, 500);
+      });
+</script>
+
+<style>
+
+  .pln    { color: #444;    } /* plain text                 */
+  .tag    { color: #515484; } /* div, span, a, etc          */
+  .atn,
+  .atv    { color: #314B17; } /* href, datetime             */
+  .new    { color: #660003; } /* itemscope, itemtype, etc,. */
+  .curl   { color: #080;    } /* new url                    */
+
+</style>
+
+</head>
+<body>
+    <div id="container">
+        <div id="intro">
+            <div id="pageHeader">
+              <div class="wrapper">
+                <h1>schema.org</h1>
+
+<div id="cse-search-form" style="width: 400px;"></div>
+
+<script type="text/javascript" src="http://www.google.com/jsapi"></script>
+<script type="text/javascript">
+  google.load('search', '1', {language : 'en', style : google.loader.themes.ESPRESSO});
+  google.setOnLoadCallback(function() {
+    var customSearchControl = new google.search.CustomSearchControl('013516846811604855281:nj5laplixaa');
+    customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+    var options = new google.search.DrawOptions();
+    options.enableSearchboxOnly("docs/search_results.html", null, false, '#');
+    customSearchControl.draw('cse-search-form', options);
+  }, true);
+</script>
+
+
+              </div>
+            </div>
+        </div>
+    </div>
+
+            <div id="selectionbar">
+               <div class="wrapper">
+                <ul>
+                    <li >
+                      <a href="docs/documents.html">Documentation</a></li>
+                    <li class="activelink">
+                      <a href="docs/schemas.html">Schemas</a></li>
+                    <li >
+                      <a href=".">Home</a></li>
+                </ul>
+                </div>
+
+            </div>
+        <div style="padding: 14px; float: right;" id="languagebox"></div>
+
+  <div id="mainContent">
+
+
+  <h1 class="page-title">
+
+
+      <a href=Thing>Thing</a>
+
+      &gt;
+      <a href=Product>Product</a>
+
+  </h1>
+  A product is anything that is made available for sale—for example, a pair of shoes, a concert ticket, or a car. Commodity services, like haircuts, can also be represented using this type.
+
+
+
+        <table cellspacing="3" class="definition-table">
+        <thead><tr><th>Property</th><th>Expected Type</th><th>Description</th>
+               </tr></thead>
+
+
+        <thead class="supertype"><tr>
+            <th class="supertype-name" colspan="3">Properties from <a href="Thing">Thing</a></th></tr></thead>
+        <tbody class="supertype">
+
+
+        <tr><th class="prop-nam" scope="row">
+          <code>additionalType</code></th>
+          <td class="prop-ect">
+
+
+
+                URL
+
+
+          </td>
+          <td class="prop-desc">An additional type for the item, typically used for adding more specific types from external vocabularies in microdata syntax. This is a relationship between something and a class that the thing is in. In RDFa syntax, it is better to use the native RDFa syntax - the 'typeof' attribute - for multiple types. Schema.org tools may have only weaker understanding of extra types, in particular those defined externally.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>description</code></th>
+          <td class="prop-ect">
+
+
+
+                Text
+
+
+          </td>
+          <td class="prop-desc">A short description of the item.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>image</code></th>
+          <td class="prop-ect">
+
+
+
+                URL
+
+
+          </td>
+          <td class="prop-desc">URL of an image of the item.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>name</code></th>
+          <td class="prop-ect">
+
+
+
+                Text
+
+
+          </td>
+          <td class="prop-desc">The name of the item.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>url</code></th>
+          <td class="prop-ect">
+
+
+
+                URL
+
+
+          </td>
+          <td class="prop-desc">URL of the item.</td>
+        </tr>
+
+
+
+
+
+        <thead class="supertype"><tr>
+            <th class="supertype-name" colspan="3">Properties from <a href="Product">Product</a></th></tr></thead>
+        <tbody class="supertype">
+
+
+        <tr><th class="prop-nam" scope="row">
+          <code>aggregateRating</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=AggregateRating>AggregateRating</a>
+
+
+          </td>
+          <td class="prop-desc">The overall rating, based on a collection of reviews or ratings, of the item.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>brand</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Brand>Brand</a>
+
+
+              or
+
+                <a href=Organization>Organization</a>
+
+
+          </td>
+          <td class="prop-desc">The brand(s) associated with a product or service, or the brand(s) maintained by an organization or business person.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>color</code></th>
+          <td class="prop-ect">
+
+
+
+                Text
+
+
+          </td>
+          <td class="prop-desc">The color of the product.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>depth</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Distance>Distance</a>
+
+
+              or
+
+                <a href=QuantitativeValue>QuantitativeValue</a>
+
+
+          </td>
+          <td class="prop-desc">The depth of the product.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>gtin13</code></th>
+          <td class="prop-ect">
+
+
+
+                Text
+
+
+          </td>
+          <td class="prop-desc">The GTIN-13 code of the product, or the product to which the offer refers. This is equivalent to 13-digit ISBN codes and EAN UCC-13. Former 12-digit UPC codes can be converted into a GTIN-13 code by simply adding a preceeding zero.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>gtin14</code></th>
+          <td class="prop-ect">
+
+
+
+                Text
+
+
+          </td>
+          <td class="prop-desc">The GTIN-14 code of the product, or the product to which the offer refers.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>gtin8</code></th>
+          <td class="prop-ect">
+
+
+
+                Text
+
+
+          </td>
+          <td class="prop-desc">The GTIN-8 code of the product, or the product to which the offer refers. This code is also known as EAN/UCC-8 or 8-digit EAN.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>height</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Distance>Distance</a>
+
+
+              or
+
+                <a href=QuantitativeValue>QuantitativeValue</a>
+
+
+          </td>
+          <td class="prop-desc">The height of the item.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>isAccessoryOrSparePartFor</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Product>Product</a>
+
+
+          </td>
+          <td class="prop-desc">A pointer to another product (or multiple products) for which this product is an accessory or spare part.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>isConsumableFor</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Product>Product</a>
+
+
+          </td>
+          <td class="prop-desc">A pointer to another product (or multiple products) for which this product is a consumable.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>isRelatedTo</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Product>Product</a>
+
+
+          </td>
+          <td class="prop-desc">A pointer to another, somehow related product (or multiple products).</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>isSimilarTo</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Product>Product</a>
+
+
+          </td>
+          <td class="prop-desc">A pointer to another, functionally similar product (or multiple products).</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>itemCondition</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=OfferItemCondition>OfferItemCondition</a>
+
+
+          </td>
+          <td class="prop-desc">A predefined value from OfferItemCondition or a textual description of the condition of the product or service, or the products or services included in the offer.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>logo</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=ImageObject>ImageObject</a>
+
+
+              or
+
+                URL
+
+
+          </td>
+          <td class="prop-desc">URL of an image for the logo of the item.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>manufacturer</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Organization>Organization</a>
+
+
+          </td>
+          <td class="prop-desc">The manufacturer of the product.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>model</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=ProductModel>ProductModel</a>
+
+
+              or
+
+                Text
+
+
+          </td>
+          <td class="prop-desc">The model of the product. Use with the URL of a ProductModel or a textual representation of the model identifier. The URL of the ProductModel can be from an external source. It is recommended to additionally provide strong product identifiers via the gtin8/gtin13/gtin14 and mpn properties.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>mpn</code></th>
+          <td class="prop-ect">
+
+
+
+                Text
+
+
+          </td>
+          <td class="prop-desc">The Manufacturer Part Number (MPN) of the product, or the product to which the offer refers.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>offers</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Offer>Offer</a>
+
+
+          </td>
+          <td class="prop-desc">An offer to sell this item&#x2014;for example, an offer to sell a product, the DVD of a movie, or tickets to an event.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>productID</code></th>
+          <td class="prop-ect">
+
+
+
+                Text
+
+
+          </td>
+          <td class="prop-desc">The product identifier, such as ISBN. For example: <code>&lt;meta itemprop='productID' content='isbn:123-456-789'/&gt;</code>.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>releaseDate</code></th>
+          <td class="prop-ect">
+
+
+
+                Date
+
+
+          </td>
+          <td class="prop-desc">The release date of a product or product model. This can be used to distinguish the exact variant of a product.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>review</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Review>Review</a>
+
+
+          </td>
+          <td class="prop-desc">A review of the item.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>reviews</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Review>Review</a>
+
+
+          </td>
+          <td class="prop-desc">Review of the item (legacy spelling; see singular form, review).</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>sku</code></th>
+          <td class="prop-ect">
+
+
+
+                Text
+
+
+          </td>
+          <td class="prop-desc">The Stock Keeping Unit (SKU), i.e. a merchant-specific identifier for a product or service, or the product to which the offer refers.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>weight</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=QuantitativeValue>QuantitativeValue</a>
+
+
+          </td>
+          <td class="prop-desc">The weight of the product.</td>
+        </tr>
+
+        <tr><th class="prop-nam" scope="row">
+          <code>width</code></th>
+          <td class="prop-ect">
+
+
+
+                <a href=Distance>Distance</a>
+
+
+              or
+
+                <a href=QuantitativeValue>QuantitativeValue</a>
+
+
+          </td>
+          <td class="prop-desc">The width of the item.</td>
+        </tr>
+
+
+         </table>
+
+
+
+
+  <h3>More specific types</h3>
+  <ul>
+
+    <li><a href=IndividualProduct>IndividualProduct</a>
+
+    <li><a href=ProductModel>ProductModel</a>
+
+    <li><a href=SomeProducts>SomeProducts</a>
+
+  </ul>
+
+
+
+
+
+  <div class="attrib">This class contains derivatives of properties from the GoodRelations Vocabulary for E-Commerce, created by Martin Hepp. GoodRelations is a data model for sharing e-commerce data on the Web that can be expressed in a variety of syntaxes, including RDFa and HTML5 Microdata. More information about GoodRelations can be found at <a href="http://purl.org/goodrelations/">http://purl.org/goodrelations/</a>.</div>
+
+
+<div class="version">Schema Draft Version 0.99</div>
+
+  <hr>
+  <b>Example 1</b>
+  <p><b>Original HTML:</b>
+  <pre class="prettyprint lang-html linenums">
+Kenmore White 17" Microwave
+&lt;img src="kenmore-microwave-17in.jpg" alt='Kenmore 17" Microwave' /&gt;
+Rated 3.5/5 based on 11 customer reviews
+
+$55.00
+In stock
+
+Product description:
+0.7 cubic feet countertop microwave. Has six preset cooking categories and
+ convenience features like Add-A-Minute and Child Lock.
+
+Customer reviews:
+
+Not a happy camper - by Ellie, April 1, 2011
+1/5 stars
+The lamp burned out and now I have to replace it.
+
+ Value purchase - by Lucas, March 25, 2011
+4/5 stars
+Great microwave for the price. It is small and fits in my apartment.
+...
+</pre>
+  <br><br><b>With Microdata:</b>
+  <pre  class="prettyprint lang-html linenums">
+&lt;div itemscope itemtype="http://schema.org/Product"&gt;
+  &lt;span itemprop="name"&gt;Kenmore White 17" Microwave&lt;/span&gt;
+  &lt;img src="kenmore-microwave-17in.jpg" alt='Kenmore 17" Microwave' /&gt;
+  &lt;div itemprop="aggregateRating"
+    itemscope itemtype="http://schema.org/AggregateRating"&gt;
+   Rated &lt;span itemprop="ratingValue"&gt;3.5&lt;/span&gt;/5
+   based on &lt;span itemprop="reviewCount"&gt;11&lt;/span&gt; customer reviews
+  &lt;/div&gt;
+
+  &lt;div itemprop="offers" itemscope itemtype="http://schema.org/Offer"&gt;
+    &lt;span itemprop="price"&gt;$55.00&lt;/span&gt;
+    &lt;link itemprop="availability" href="http://schema.org/InStock" /&gt;In stock
+  &lt;/div&gt;
+
+  Product description:
+  &lt;span itemprop="description"&gt;0.7 cubic feet countertop microwave.
+  Has six preset cooking categories and convenience features like
+  Add-A-Minute and Child Lock.&lt;/span&gt;
+
+  Customer reviews:
+
+  &lt;div itemprop="review" itemscope itemtype="http://schema.org/Review"&gt;
+    &lt;span itemprop="name"&gt;Not a happy camper&lt;/span&gt; -
+    by &lt;span itemprop="author"&gt;Ellie&lt;/span&gt;,
+    &lt;meta itemprop="datePublished" content="2011-04-01"&gt;April 1, 2011
+    &lt;div itemprop="reviewRating" itemscope itemtype="http://schema.org/Rating"&gt;
+      &lt;meta itemprop="worstRating" content = "1"&gt;
+      &lt;span itemprop="ratingValue"&gt;1&lt;/span&gt;/
+      &lt;span itemprop="bestRating"&gt;5&lt;/span&gt;stars
+    &lt;/div&gt;
+    &lt;span itemprop="description"&gt;The lamp burned out and now I have to replace
+    it. &lt;/span&gt;
+  &lt;/div&gt;
+
+  &lt;div itemprop="review" itemscope itemtype="http://schema.org/Review"&gt;
+    &lt;span itemprop="name"&gt;Value purchase&lt;/span&gt; -
+    by &lt;span itemprop="author"&gt;Lucas&lt;/span&gt;,
+    &lt;meta itemprop="datePublished" content="2011-03-25"&gt;March 25, 2011
+    &lt;div itemprop="reviewRating" itemscope itemtype="http://schema.org/Rating"&gt;
+      &lt;meta itemprop="worstRating" content = "1"/&gt;
+      &lt;span itemprop="ratingValue"&gt;4&lt;/span&gt;/
+      &lt;span itemprop="bestRating"&gt;5&lt;/span&gt;stars
+    &lt;/div&gt;
+    &lt;span itemprop="description"&gt;Great microwave for the price. It is small and
+    fits in my apartment.&lt;/span&gt;
+  &lt;/div&gt;
+  ...
+&lt;/div&gt;
+</pre>
+
+  <hr>
+  <b>Example 2</b>
+  <p><b>Original HTML:</b>
+  <pre class="prettyprint lang-html linenums">
+&lt;img src="dell-30in-lcd.jpg" /&gt;
+Dell UltraSharp 30" LCD Monitor
+
+87 out of 100 based on 24 user ratings
+
+$1250 to $1495 from 8 sellers
+
+Sellers:
+&lt;a href="save-a-lot-monitors.com/dell-30.html"&gt;
+  Save A Lot Monitors - $1250&lt;/a&gt;
+&lt;a href="jondoe-gadgets.com/dell-30.html"&gt;
+  Jon Doe's Gadgets - $1350&lt;/a&gt;
+...
+</pre>
+  <br><br><b>With Microdata:</b>
+  <pre  class="prettyprint lang-html linenums">
+&lt;div itemscope itemtype="http://schema.org/Product"&gt;
+  &lt;img itemprop="image" src="dell-30in-lcd.jpg" /&gt;
+  &lt;span itemprop="name"&gt;Dell UltraSharp 30" LCD Monitor&lt;/span&gt;
+
+  &lt;div itemprop="aggregateRating"
+    itemscope itemtype="http://schema.org/AggregateRating"&gt;
+    &lt;span itemprop="ratingValue"&gt;87&lt;/span&gt;
+    out of &lt;span itemprop="bestRating"&gt;100&lt;/span&gt;
+    based on &lt;span itemprop="ratingCount"&gt;24&lt;/span&gt; user ratings
+  &lt;/div&gt;
+
+  &lt;div itemprop="offers" itemscope itemtype="http://schema.org/AggregateOffer"&gt;
+    &lt;span itemprop="lowPrice"&gt;$1250&lt;/span&gt;
+    to &lt;span itemprop="highPrice"&gt;$1495&lt;/span&gt;
+    from &lt;span itemprop="offerCount"&gt;8&lt;/span&gt; sellers
+
+  Sellers:
+  &lt;div itemprop="offers" itemscope itemtype="http://schema.org/Offer"&gt;
+    &lt;a itemprop="url" href="save-a-lot-monitors.com/dell-30.html"&gt;
+     Save A Lot Monitors - $1250&lt;/a&gt;
+  &lt;/div&gt;
+  &lt;div itemprop="offers" itemscope itemtype="http://schema.org/Offer"&gt;
+    &lt;a itemprop="url" href="jondoe-gadgets.com/dell-30.html"&gt;
+     Jon Doe's Gadgets - $1350&lt;/a&gt;
+  &lt;/div&gt;
+  ...
+&lt;/div&gt;
+</pre>
+
+<br><br>
+
+
+  </div>
+
+
+<div id="footer"><p>
+  <a href="docs/terms.html">Terms and conditions</a></p>
+</div>
+
+</body>
+</html>
\ No newline at end of file