Merge remote-tracking branch 'origin/master' into idea-13-0

Conflicts:
	idea/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.kt
	idea/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt
	idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt
	update_dependencies.xml