Changes icon pos
Adds new geocoding error
Merge branch 'CDB-1699' of github.com:CartoDB/cartodb into CDB-1699

* 'CDB-1699' of github.com:CartoDB/cartodb:
  CDB-1699 Use contry names instead of iso3 codes for internal functions
  CDB-1699 Change geocoding API queries to match temporary table structure