improving layer sorting - fixes vizzuality/cartodb-management#2176
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop