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

Conflicts:
	compiler/testData/asJava/nullabilityAnnotations/Generic.java
	idea/src/META-INF/plugin.xml
	idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java
	idea/testData/completion/basic/java/PropertyMetadata.kt
	update_dependencies.xml