Merge branch 'master' into correct-selection-after-multi-edit

Conflicts:
	org.scala-ide.sdt.core.tests/src/org/scalaide/TestsSuite.scala
	org.scala-ide.sdt.core/src/org/scalaide/util/eclipse/EditorUtils.scala
	org.scala-ide.sdt.core/src/org/scalaide/util/eclipse/RegionUtils.scala
	org.scala-ide.sdt.core/src/org/scalaide/util/internal/eclipse/TextEditUtils.scala