Merge remote-tracking branch 'upstream/master' into for-each-intention

Conflicts:
generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
idea/src/org/jetbrains/jet/plugin/JetBundle.properties
idea/tests/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformatio
nTest.java
idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGen
erated.java
Updated to adhere to coding standards, and enabled tests.