Merge branch 'master' of git.labs.intellij.net:idea/community

Conflicts:
	platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java

java/java-tests/testData/codeInsight/completion/normal/FinalInForLoop.java

@@ -0,0 +1,7 @@
+public class Foooo {
+
+    {
+        for (fin<caret>x)
+    }
+
+}

java/java-tests/testData/codeInsight/completion/normal/PrimitiveTypesInForLoopSpace.java

@@ -0,0 +1,8 @@
+public class Foooo {
+
+    {
+        int intaaaa;
+        for (in<caret>)
+    }
+
+}

java/java-tests/testData/codeInsight/completion/normal/PrimitiveTypesInForLoopSpace_after.java

@@ -0,0 +1,8 @@
+public class Foooo {
+
+    {
+        int intaaaa;
+        for (int <caret>)
+    }
+
+}

java/java-tests/testData/codeInsight/completion/normal/SpaceAfterReturn.java

@@ -0,0 +1,8 @@
+public abstract class Zzza {
+
+    int foo() {
+        ret<caret>x
+    }
+
+
+}

java/java-tests/testData/codeInsight/completion/normal/SpaceAfterReturn_after.java

@@ -0,0 +1,8 @@
+public abstract class Zzza {
+
+    int foo() {
+        return <caret>x
+    }
+
+
+}