Merge branch 'master' into smartcompletion

diff --cc plugins/groovy/src/META-INF/plugin.xml
Simple merge

diff --cc plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
Simple merge

diff --cc plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CompletionProcessor.java
index 97ad50dbfcbfe4967286faa919ba7761c65c21ac,d60adfc72832373d7f7a260a5adbe2242e17b4fb..86f37a322fca7f20cf88730d4843b5ecf91e0dc3
--- 1/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CompletionProcessor.java
--- 2/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CompletionProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CompletionProcessor.java
@@@ -54,9 -53,8 +54,9 @@@ public class CompletionProcessor extend
      return new CompletionProcessor(place, EnumSet.of(ResolveKind.PACKAGE, ResolveKind.CLASS), null);
    }
  
 +  @NotNull
    public GroovyResolveResult[] getCandidates() {
      if (myCandidates.size() == 0) return GroovyResolveResult.EMPTY_ARRAY;
-     return ResolveUtil.filterSameSignatureCandidates(myCandidates);
+     return ResolveUtil.filterSameSignatureCandidates(myCandidates, -1);
    }
  }

diff --cc plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java
Simple merge