some refactoring
Merge branch 'akka' of https://github.com/juliusse/freeplane into akka
commit that i can merge with alex changes
more refactoring, added ErrorMessage