Merge pull request #59 from USGS-CIDA/GLRIDB-290_Re-Factor_Location_Filters

rm the Location Type and merged it into the Location control (now called...