add port to map base url
resolve merge conflict in comment
bug fix: map view was not added to applet scroll pane
Merge remote-tracking branch 'origin/master'