Adds new badges. Fixes position. Fixes Vizzuality/cartodb-management#2584
Merged