Fixed Vizzuality/cartodb-management#ls2673
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop

* 'develop' of github.com:CartoDB/cartodb20:
  improving layer sorting - fixes vizzuality/cartodb-management#2176
  Cosmetic refactor in visualizations controller
Comment out test
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop

* 'develop' of github.com:CartoDB/cartodb20:
  max layers changed to 4, by @saleiva