reworded auth denial text
added none to comp-op setting
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Merge branch 'hotfix/change_quota_calculation'
Fix
Merge branch 'hotfix/modify_disk_quota_task' into develop
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop

* 'develop' of github.com:CartoDB/cartodb20:
  Fix
Updates cdb
Don't return a class name if no urlTemplate is provided
Fix
Moves the basemap dropdown to the left
Fix spelling of MapBox (previously was 'Mapbox')
Geocoder tests fixed
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop

* 'develop' of github.com:CartoDB/cartodb20:
  Geocoder tests fixed
Updates NEWS.md with the basemap layer selector
Adds rake task to reset the check_quota trigger on all tables
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Merge pull request #58 from agoddard/develop

reworded auth denial text