Merge remote branch 'origin/master'

Conflicts:
	idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java

idea/testData/codegen/patternMatching/is.jet

@@ -0,0 +1,11 @@
+fun typeName(a: Any?) : String {
+    return when(a) {
+        is java.util.ArrayList<Int> => "array list"
+        else => "no idea"
+    }
+}
+
+fun box() : String {
+    if(typeName(java.util.ArrayList<Int> ()) != "array list") return "array list failed"
+    return "OK"
+}