Renames Heatmap to Intensity. It correctly moves the wizard navigation when the selected option is in the second page
When the user selects the count method in a spatial merge, we now show a message
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop

* 'develop' of github.com:CartoDB/cartodb20:
  Remove hard-coded Varnish purge commands, use Rails configuration settings
  Refactor ColumnTypecaster
  use ColumnConverter in Table model
  separate column data type conversion to its own class
  Ability to rename the user when relocating him
  Make relocator loader support tables with no data_import_id (created from scratch)
  integrate Redis metadata classes into relocation loader
  Implement TableMetadata, APICredentialMetadata, MapStyleMetadata
  rename ThresholdData to ThresholdMetaData
  Implement UserMetadata for Relocator
  Implement ThresholdData for Relocator
  wip: preliminary spec for redis loader
  fix sped for redis dumper
  Implement ability to dump metadata in Redis
Adds message in the count method of the spatial merge
Updates NEWS.md