CDB-2891 fixes for missing fields and upload of org image
Merge branch 'CDB-2891' of https://github.com/CartoDB/cartodb into CDB-2891