organization extra components fixed
Merge branch 'CDB-2891' of github.com:CartoDB/cartodb into CDB-2891

t push origin CDB-2891