commited all changes. Done work on akka upgrade