fixed overlays
Merge branch 'CDB-2959' of github.com:CartoDB/cartodb into CDB-2959