updates
Merge branch 'develop' of https://github.com/Esri/geoportal-server into develop

Conflicts:
	components/flex/extension/trunk/geoportal/src/widgets/FindData/FindDataWidget.xml