merge
Merge branch 'Bettermap' of https://github.com/MariusSchmidt/Schreibwerkstatt into Bettermap