data.gov and Geoss add
Merge branch 'develop' of https://github.com/Esri/geoportal-server into develop

Conflicts Resolved:
	geoportal/src/gpt/resources/gpt.properties
Merge branch 'develop' of https://github.com/Esri/geoportal-server into develop