updated scala and akka
Merge branch 'develop'