First temp commit
Merge branch 'watch-expressions-implementation-1001934' of https://github.com/uqbar-project/scala-ide into watch-expressions-implementation-1001934

Conflicts:
	org.scala-ide.sdt.debug/src/scala/tools/eclipse/debug/model/ScalaWatchExpressionDelegate.scala