Bumped version of scala maven plugin

Previous version was not handling correctly 2.11.0-SNAPSHOT and
2.11.0-M5 Scala library versions.
Bumped version of tycho plug-in
Merge branch 'misc' of git://github.com/dotta/scalatest-eclipse-plugin

Conflicts:
	pom.xml