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

Conflicts:
	components/flex/extension/trunk/geoportal/src/com/esri/gpt/wms/WMSLayer.as
Merge branch 'develop' of https://github.com/Esri/geoportal-server into develop

Conflicts:
	NOTICE.txt
Merge branch 'develop' of https://github.com/Esri/geoportal-server into develop
removing icons from showing