Changes for jess
Merge branch 'dev' of https://github.com/OPEC-PML/GISportal into dev