changes from 2.0 applied in 2.1 - map share dialog
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop