akka spec
Merge branch 'master' of https://github.com/DannyWE/Scala-in-deep

Conflicts:
	core/build.sbt