fixed intensity default marker color
fixed error when user imports a file with accents
Merge branch 'release/staging' of github.com:CartoDB/cartodb20 into release/staging