Merge branch 'open-street-map-integration' of...

Merge branch 'open-street-map-integration' of ssh://git@dev.kom.e-technik.tu-darmstadt.de/maki/simonstrator-peerfact.git into open-street-map-integration