Switch from build.sbt to Build.scala
Merge branch 'master' into akka

Conflicts:
	src/main/g8/build.sbt