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 'develop' of github.com:CartoDB/cartodb20 into develop