merge from pmlrsg/GISportal dev
Merge branch 'pmlrsg-dev' into dev