Intermediate commit
Merge branch 'develop' into feature/mapimprovements

Conflicts:
	lmkp/templates/map-view.mak
Introduce client-side clustering
Merge branch 'feature/mapimprovements' into develop
Merge branch 'develop' of github.com:CDE-UNIBE/lokp into develop