Adds missing method to fix refresh bug
Merge branch 'hotfix/legend_refresh'

* hotfix/legend_refresh:
  Adds missing method to fix refresh bug
CDB-190 #resolve ok button in assets manager
Merge branch 'hotfix/CDB-187'
Merge branch 'master' of github.com:CartoDB/cartodb into develop

Conflicts:
	services/importer/lib/importer/csv_normalizer.rb
loading assets manager
Merge branch 'develop' of github.com:CartoDB/cartodb into develop