sbt integration, first move
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cli/package.scala
merge fail fixed
setup for sbt and ScalaTest in Eclipse