mege
Merge branch 'custommap' of https://github.com/MariusSchmidt/Schreibwerkstatt into custommap
Merge branch 'custommap' of https://github.com/MariusSchmidt/Schreibwerkstatt into custommap
Added user position watch