Map no longer loads the addresses before showing
Merge branch 'dev-gui' of ssh://github.com/Farenheight/Lidkoping-SH into dev-gui
FIxed merge conflicts