fixed problem with color undefined in basemaps dropdown - fixes vizzuality/cartodb-management#2633
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop