Update dev branch#30

julkuh wants to merge 2 commits intodevconterra/mapapps-4-developers:devfrom

masterconterra/mapapps-4-developers:masterCopy head branch name to clipboard