updated cartodb.js
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
fixed Vizzuality/cartodb-management#2717
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop