GitLab

# Conflicts:
#	package.json

config: extracted arachneTypes into a function in config; now used by import not as passed down prop

Update react-leaflet-markercluster to make MarkerClusterGroup work with updated (react-)Leaflet versions

# Conflicts:
#	src/utils.js

# Conflicts:
#	src/components/AppContent/AppContent.jsx