Changed the settings and finalized the colorbar setup
Merge remote-tracking branch 'origin/jon' into nchaney
Fixed settings.xml
Enabled point data
only make point ajax calls when popup is visible
logic problem