Updated to akka 2.3.6 with scala 2.11.4
Merge branch 'maiha-akka-2.3'