Merge branch 'master' of https://github.com/baviereteam/mapwriter-server
Merge branch 'master' of https://github.com/baviereteam/mapwriter-server