diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dfab0280b76..5825166258d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,15 +10,12 @@
   </component>
   <component name="BookmarkManager">
     <bookmark url="file://$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/safeCallReturnsNullIfFails.kt" line="3" />
-    <bookmark url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" line="66" />
+    <bookmark url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" line="69" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="pr">
+    <list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="quick fix that solves method overloading problem.">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Declarations.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Declarations.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" />
     </list>
     <ignored path="k2js.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -122,19 +119,6 @@
         <option name="CONDITION" value="" />
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java" line="143" class="org.jetbrains.k2js.translate.utils.TranslationUtils" package="org.jetbrains.k2js.translate.utils">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
       <breakpoint url="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java" line="92" class="org.jetbrains.jet.lang.resolve.java.JavaPackageScope" package="org.jetbrains.jet.lang.resolve.java">
         <option name="ENABLED" value="true" />
         <option name="LOG_ENABLED" value="false" />
@@ -196,8 +180,8 @@
       <property name="field_breakpoints_groupByClasses" value="true" />
       <property name="method_breakpoints_groupByClasses" value="true" />
       <property name="exception_breakpoints_viewId" value="TABLE" />
-      <property name="field_breakpoints_viewId" value="TABLE" />
       <property name="exception_breakpoints_groupByClasses" value="true" />
+      <property name="field_breakpoints_viewId" value="TABLE" />
       <property name="method_breakpoints_groupByMethods" value="false" />
     </ui_properties>
   </component>
@@ -205,42 +189,58 @@
     <favorites_list name="k2js" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.58356744">
+    <splitter split-orientation="horizontal" split-proportion="0.7777778">
       <split-first>
         <leaf>
-          <file leaf-file-name="NamingScope.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="71" column="10" selection-start="2280" selection-end="2280" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="K2JSTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="78" column="37" selection-start="2936" selection-end="2936" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="e#5123#5131#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="DeclarationVisitor.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="42" column="92" selection-start="1862" selection-end="1862" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="Declarations.java" pinned="false" current="true" current-in-tab="true">
+          <file leaf-file-name="Declarations.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Declarations.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="49" column="68" selection-start="1956" selection-end="1956" vertical-scroll-proportion="0.8257042">
+                <state line="72" column="77" selection-start="2800" selection-end="2800" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="NameClashesTest.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/NameClashesTest.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="19" column="5" selection-start="404" selection-end="404" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="methodOverload.js" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/nameClashes/out/methodOverload.js">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="9" column="42" selection-start="182" selection-end="182" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="DescriptorUtils.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="88" column="55" selection-start="3641" selection-end="3641" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="TranslationUtils.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="143" column="0" selection-start="6518" selection-end="6518" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="PatternMatchingTest.java" pinned="false" current="true" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="27" column="16" selection-start="538" selection-end="538" vertical-scroll-proportion="0.7900172">
                   <folding />
                 </state>
               </provider>
@@ -282,24 +282,6 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="NonNls.class" pinned="false" current="false" current-in-tab="false">
-            <entry file="jar://C:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 112.121/lib/annotations.jar!/org/jetbrains/annotations/NonNls.class">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="8" column="18" selection-start="563" selection-end="563" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="JsPrettyNamer.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/js/src/com/google/dart/compiler/backend/js/JsPrettyNamer.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="16" column="13" selection-start="602" selection-end="602" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
         </leaf>
       </split-first>
       <split-second>
@@ -325,7 +307,7 @@
           <file leaf-file-name="JavaPackageScope.java" pinned="false" current="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="88" column="99" selection-start="3428" selection-end="3428" vertical-scroll-proportion="0.79577464">
+                <state line="88" column="99" selection-start="3428" selection-end="3428" vertical-scroll-proportion="1.6545801">
                   <folding />
                 </state>
               </provider>
@@ -391,11 +373,9 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java" />
         <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/AppletTest.java" />
         <option value="$PROJECT_DIR$/translator/testFiles/nameClashes/cases/methodOverload.kt" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StaticContext.java" />
-        <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/NameClashesTest.java" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslatorApplet.java" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/ErrorSender.java" />
         <option value="$PROJECT_DIR$/translator/testFiles/kotlin_lib.js" />
@@ -407,6 +387,8 @@
         <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/WebDemoExamplesTest.java" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DeclarationVisitor.java" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Declarations.java" />
+        <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/NameClashesTest.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java" />
       </list>
     </option>
   </component>
@@ -496,21 +478,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -619,6 +586,50 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="nameClashes" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="out" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="nameClashes" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="k2js" />
@@ -631,6 +642,21 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="Favorites" />
     </panes>
   </component>
@@ -649,9 +675,9 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="dynamic.classpath" value="false" />
-    <property name="options.splitter.details.proportions" value="0.2" />
     <property name="options.searchVisible" value="true" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="dynamic.classpath" value="false" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -670,6 +696,293 @@
       <recent name="org.jetbrains.k2js.test.examples" />
     </key>
   </component>
+  <component name="RestoreUpdateTree">
+    <UpdateInfo date="Moments ago" ActionInfo="_Update">
+      <UpdatedFiles>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Updated from server" />
+          <option name="myStatusName" value="Changed on server" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="CHANGED_ON_SERVER" />
+          <FILE-GROUP>
+            <option name="myUpdateName" value="Updated" />
+            <option name="myStatusName" value="Changed" />
+            <option name="mySupportsDeletion" value="false" />
+            <option name="myCanBeAbsent" value="false" />
+            <option name="myId" value="UPDATED" />
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/.idea/artifacts/WebViewApplet_jar.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/.idea/artifacts/WebViewServer_jar.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/.idea/modules.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/.idea/workspace.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/TestModule/TestModule.iml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebView.iml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewApplet/src/web/view/ukhorskaya/ErrorWriterInApplet.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewApplet/src/web/view/ukhorskaya/InitializerApplet.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/WebViewServer.iml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/codemirror/lib/codemirror.css</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/codemirror/lib/codemirror.js</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/codemirror/lib/complete.js</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/codemirror/mode/clike/kotlin.js</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/components/common.js</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/components/components.css</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/components/components.js</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/header.html</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/icons/error.png</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/icons/warning.png</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/images/switch.gif</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/logs.html</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/log4j.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/Initializer.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/Main.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/Statistics.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/examplesLoader/ExamplesList.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/examplesLoader/ExamplesLoader.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/handlers/ServerHandler.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/responseHelpers/JavaRunner.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/server/KotlinHttpServer.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/sessions/HttpSession.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/examples/Basic syntax walk-through/Null-checks.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/examples/Basic syntax walk-through/Use pattern-matching.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/examples/Basic syntax walk-through/Use ranges and in.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/examples/Hello, world!/A multi-language Hello.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/examples/helpExamples.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/MyDeclarationDescriptorVisitor.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/ResponseUtils.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/errorsDescriptors/ErrorAnalyzer.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/responseHelpers/JsonResponseForCompletion.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/server/ServerSettings.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/web/view/ukhorskaya/session/SessionInfo.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/j2k.ipr</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/Converter.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/ArrayWithoutInitializationExpression.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/BinaryExpression.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/CaseContainer.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/Class.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/ClassType.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/File.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/IMember.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/INode.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/Identifier.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/NewClassExpression.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/Node.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/SwitchContainer.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ast/SwitchLabelStatement.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/util/AstUtil.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/ClassVisitor.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/test/org/jetbrains/jet/j2k/TestCaseBuilder.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/annotations/file/jetbrainsNotNull.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/boxedType/file/kt-671.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/class/file/kt-639.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/constructors/file/customerBuilder.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/constructors/file/genericIdentifier.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/enum/class/colorEnum.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/enum/class/primaryPrivateConstructor.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/comp/intNullability.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/file/packageWithClass.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/file/packageWithImports.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/file/packageWithMixedImports.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/file/packageWithOpenClass.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/file/file/packageWithStaticImports.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/function/file/extendsBaseWhichExtendsObject.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/function/file/functionInFinalClass.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/function/file/overrideObject.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/function/file/varVararg.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/function/file/writableParameter.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/importStatement/file/importWithKeywords.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/importStatement/file/importWithStar.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/importStatement/file/simpleImport.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-543-boxed.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-543-mixed.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-543.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-696.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-792-mixed.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-792.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-794-mixed.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-809-string.jav</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-809-string.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-809.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-820-field.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-820.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-824-isDir.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-824.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-836.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-837.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/kotlinExclusion/file/kt-656.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/literalExpression/file/dollarInsideString.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/methodCallExpression/file/genericMethod.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/fullQualifiedName.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/fullQualifiedName2.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/newClassByFullName.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/newInnerClass.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/newListAndNewMember.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/newClassExpression/file/newStaticInnerClass.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/objectLiteral/file/MyFrame.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/rawGenerics/file/kt-540-map.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/rawGenerics/file/kt-540.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/rawGenerics/file/rawGenericMethod.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/switch/file/comlicatedFallDown.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/switch/file/fallDown.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/switch/file/kt-539.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../java-compatibility/src/candidates.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../java-compatibility/src/nullability.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslatorApplet.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../upstream-patches/j2k</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../upstream-patches/xsd</PATH>
+          </FILE-GROUP>
+          <FILE-GROUP>
+            <option name="myUpdateName" value="Created" />
+            <option name="myStatusName" value="Created" />
+            <option name="mySupportsDeletion" value="false" />
+            <option name="myCanBeAbsent" value="false" />
+            <option name="myId" value="CREATED" />
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/icons/executeJava.png</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/icons/executeJavaScript.png</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/icons/javatokotlin.PNG</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/kotlin_lib.js</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/login.html</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/authorization/UserAuthenticator.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/responseHelpers/JavaConverterRunner.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/src/web/view/ukhorskaya/responseHelpers/JsConverter.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/statistics/managers.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/statistics/users.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/META-INF/MANIFEST.MF</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/ConverterUtil.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/src/org/jetbrains/jet/j2k/SetupJavaCoreEnvironmentException.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-638.jav</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-638.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-852.jav</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-852.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-871.jav</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-871.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-879.jav</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-879.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-893.jav</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/testData/ast/issues/file/kt-893.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/.name</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/ant.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/compiler.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/copyright/profiles_settings.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/encodings.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/libraries/junit.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/misc.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/modules.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/scopes/scope_settings.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/uiDesigner.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/.idea/vcs.xml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/kotlin-junit-3.iml</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/lib/junit.jar</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/run.sh</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/src/EstatisticasSimples.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/src/EstatisticasSimplesTest.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/src/std/compatibility/candidates.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../kotlin-junit-3/src/std/compatibility/nullability.kt</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../vim/kotlin.vim</PATH>
+          </FILE-GROUP>
+          <FILE-GROUP>
+            <option name="myUpdateName" value="Deleted" />
+            <option name="myStatusName" value="Deleted" />
+            <option name="mySupportsDeletion" value="false" />
+            <option name="myCanBeAbsent" value="true" />
+            <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/backfix.min.js</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/images/icon-arrow.gif</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/images/icon-ok.gif</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../WebView/WebViewServer/resources/images/msDropDown.gif</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/jre/lib/annotations.jar</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/jre/lib/rt.jar</PATH>
+            <PATH vcs="Git" revision="">$PROJECT_DIR$/../j2k/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java</PATH>
+          </FILE-GROUP>
+          <FILE-GROUP>
+            <option name="myUpdateName" value="Restored" />
+            <option name="myStatusName" value="Will be restored" />
+            <option name="mySupportsDeletion" value="false" />
+            <option name="myCanBeAbsent" value="false" />
+            <option name="myId" value="RESTORED" />
+          </FILE-GROUP>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Modified" />
+          <option name="myStatusName" value="Modified" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="MODIFIED" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Skipped" />
+          <option name="myStatusName" value="Skipped" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="SKIPPED" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Merged with conflicts" />
+          <option name="myStatusName" value="Will be merged with conflicts" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="MERGED_WITH_CONFLICTS" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Merged with tree conflicts" />
+          <option name="myStatusName" value="Merged with tree conflicts" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Merged" />
+          <option name="myStatusName" value="Will be merged" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="MERGED" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Not in repository" />
+          <option name="myStatusName" value="Not in repository" />
+          <option name="mySupportsDeletion" value="true" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="UNKNOWN" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Locally added" />
+          <option name="myStatusName" value="Locally added" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="LOCALLY_ADDED" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Locally removed" />
+          <option name="myStatusName" value="Locally removed" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="LOCALLY_REMOVED" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Switched" />
+          <option name="myStatusName" value="Switched" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="SWITCHED" />
+        </FILE-GROUP>
+      </UpdatedFiles>
+    </UpdateInfo>
+  </component>
   <component name="RunManager" selected="JUnit.tests">
     <configuration default="false" name="WebDemoExamplesTest.patternMatching" type="JUnit" factoryName="JUnit" temporary="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
@@ -877,6 +1190,17 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
+    <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
+      <JSDebuggerConfigurationSettings>
+        <option name="engineId" value="embedded" />
+        <option name="fileUrl" />
+      </JSDebuggerConfigurationSettings>
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="" />
@@ -903,17 +1227,6 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
-      <JSDebuggerConfigurationSettings>
-        <option name="engineId" value="embedded" />
-        <option name="fileUrl" />
-      </JSDebuggerConfigurationSettings>
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
     <configuration default="false" name="Applet" type="Applet" factoryName="Applet">
       <module name="translator" />
       <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.K2JSTranslatorApplet" />
@@ -1040,7 +1353,6 @@
       <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32853025" sideWeight="0.49812934" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32756963" sideWeight="0.4216996" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24973261" sideWeight="0.7183908" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25552353" sideWeight="0.7733832" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32949087" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
@@ -1054,11 +1366,12 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20363443" sideWeight="0.284342" order="1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977018" sideWeight="0.7002882" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997862" sideWeight="0.6705998" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23890968" sideWeight="0.6051873" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22073758" sideWeight="0.6051873" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39481267" sideWeight="0.8530198" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.0908605" sideWeight="0.7146974" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32756963" sideWeight="0.4216996" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39865515" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="JsTestDriver Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32907662" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
@@ -1097,8 +1410,9 @@
     <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
     <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
     <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
+    <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="added support for some of feature needed for applet, work on method overloading" />
+    <option name="LAST_COMMIT_MESSAGE" value="quick fix that solves method overloading problem." />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1111,7 +1425,6 @@
     <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-    <MESSAGE value="refactor" />
     <MESSAGE value="finished code clean up." />
     <MESSAGE value="extension functions support and tests." />
     <MESSAGE value="virtual extension functions support and tests." />
@@ -1136,6 +1449,7 @@
     <MESSAGE value="lost of refactoring" />
     <MESSAGE value="refactor PropertyAccessTranslato" />
     <MESSAGE value="added support for some of feature needed for applet, work on method overloading" />
+    <MESSAGE value="quick fix that solves method overloading problem." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1145,39 +1459,26 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://C:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 112.121/lib/idea.jar!/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.class">
+    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/StandardClassesTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="13" selection-start="171" selection-end="171" vertical-scroll-proportion="0.0">
+        <state line="47" column="16" selection-start="1138" selection-end="1138" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 112.121/lib/idea.jar!/com/intellij/psi/impl/file/PsiPackageImpl.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="90" column="0" selection-start="5313" selection-end="5313" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.6.0_29/jre/lib/deploy.jar!/com/sun/deploy/util/ArrayUtil.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="5" column="13" selection-start="157" selection-end="157" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 112.121/lib/annotations.jar!/org/jetbrains/annotations/NonNls.class">
+    <entry file="file://$PROJECT_DIR$/build.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="8" column="18" selection-start="563" selection-end="563" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="78" column="37" selection-start="2936" selection-end="2936" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="e#5123#5131#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="71" column="10" selection-start="2280" selection-end="2280" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/Call.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="45" column="66" selection-start="959" selection-end="959" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
@@ -1189,51 +1490,65 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 112.121/lib/idea.jar!/com/intellij/psi/impl/file/PsiPackageImpl.class">
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="90" column="0" selection-start="5313" selection-end="5313" vertical-scroll-proportion="0.0">
+        <state line="80" column="23" selection-start="3867" selection-end="3867" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/standardClasses/out/arrayFunctionConstructor.js">
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/Call.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="1" column="27" selection-start="25" selection-end="25" vertical-scroll-proportion="0.0">
+        <state line="45" column="66" selection-start="959" selection-end="959" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/StandardClassesTest.java">
+    <entry file="jar://C:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 112.121/lib/idea.jar!/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="47" column="16" selection-start="1138" selection-end="1138" vertical-scroll-proportion="0.0">
+        <state line="5" column="13" selection-start="171" selection-end="171" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="88" column="99" selection-start="3428" selection-end="3428" vertical-scroll-proportion="0.79577464">
+        <state line="88" column="99" selection-start="3428" selection-end="3428" vertical-scroll-proportion="1.6545801">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/standardClasses/out/arrayIsFilledWithNulls.js">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/nameClashes/out/methodOverload.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+        <state line="9" column="42" selection-start="182" selection-end="182" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/webDemoExamples/out/isCheck.js">
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+        <state line="71" column="10" selection-start="2280" selection-end="2280" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/WebDemoExamplesTest.java">
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="79" column="16" selection-start="2176" selection-end="2176" vertical-scroll-proportion="0.0">
+        <state line="88" column="55" selection-start="3641" selection-end="3641" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="81" column="0" selection-start="2980" selection-end="2980" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="143" column="0" selection-start="6518" selection-end="6518" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
@@ -1245,16 +1560,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/trait/cases/classDerivesFromTraitAndClass.kt">
+    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Declarations.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="49" column="68" selection-start="1956" selection-end="1956" vertical-scroll-proportion="0.8257042">
+        <state line="27" column="16" selection-start="538" selection-end="538" vertical-scroll-proportion="0.7900172">
           <folding />
         </state>
       </provider>
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java
index 1dc0e7b9bc0..8f5472790e7 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java
+++ b/translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java
@@ -83,9 +83,9 @@ public final class DescriptorUtils {
     @NotNull
     public static PropertyDescriptor getPropertyByName(@NotNull JetScope scope,
                                                        @NotNull String name) {
-        VariableDescriptor variable = scope.getLocalVariable(name);
+        VariableDescriptor variable = scope.getVariable(name);
         if (variable == null) {
-            variable = org.jetbrains.jet.lang.resolve.DescriptorUtils.filterNonExtensionProperty(scope.getProperties(name));
+            variable = scope.getPropertyByFieldReference(name);
         }
         PropertyDescriptor descriptor = (PropertyDescriptor) variable;
         assert descriptor != null : "Must have a descriptor.";