update akka version
update akka version
Merge branch 'master' of http://github.com/haghard/scenter
merge conflict