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

Conflicts:
	idea/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
	idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java

Value handling fixed

class C(x : Int) : Base(x /*parameter*/), Base1 by Base1(x) {
    val xx : Int // <- this Int used to be resolved to ERROR_CLASS
}