Merge branch 'master' into progressiveResolution

Conflicts:
	src/ucar/unidata/data/grid/GeoGridDataSource.java
	src/ucar/unidata/idv/MapViewManager.java
	src/ucar/unidata/idv/ui/ImageGenerator.java
	src/ucar/unidata/view/geoloc/MapProjectionDisplay.java