Merge remote-tracking branch 'origin/CDB-3103' into CDB-2891
Merge branch 'CDB-2891' of github.com:CartoDB/cartodb into CDB-2891
use organization to_poro for rendering username
include avatar_url when rendering organization users