Moving the akka version to the master
Fixed conflicts in ignore file