first steps
Merge branch 'feature/CDB-596' of github.com:CartoDB/cartodb20 into feature/CDB-596