last state - working on main controller spec
Merge branch 'Bettermap' of https://github.com/MariusSchmidt/Schreibwerkstatt into Bettermap