CDB-4327 Added geo-enrichment capabilities and organizations for customized config
Merge branch 'master' into CDB-4327

Conflicts:
	NEWS.md
Merge pull request #855 from CartoDB/CDB-4327

CDB-4327 Added geo-enrichment capabilities and organizations for customized config
Merge branch 'master' into CDB-4165