Revert "Revert "Merge branch 'master' of https://github.com/Geopollinator/Geopollinator""

This reverts commit 0d231679208d73854ae10e745afa78edbd2778b7.