Replaces map with new ring-road internal map
Merge remote-tracking branch 'origin/master' into mapmanager
expand display