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

Conflicts:
	idea/src/META-INF/plugin.xml
	idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java
	idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java
	update_dependencies.xml