Merge commit '0a503168cc5ce5e7c2a2526f3ccce12438b79a7c' into develop
Merge remote-tracking branch '52North/develop' into develop
move leaflet map options to settings for configuration