-- use better function
-- Java Psi facade origin
-- Update Kotlin hacks

Conflicts:
	compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
Fix parser performance: check that matchTokenStreamPredicate doesn't lookahead whole file