Interactive worksheet
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/jetbrains/plugins/scala/worksheet/actions/RunWorksheetAction.scala
Usage trigger returned