fixed embed map errors #1862
fixed #1596 #1788
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop