Problem with conflicting akka versions fixed
Merge pull request #24 from johandahlberg/hot_fix/conflicting_akka_versions

Problem with conflicting akka versions fixed
Some refactoring of the Master
Merge pull request #25 from johandahlberg/feature/master_refactoring

Some refactoring of the Master