CDB-1829 Correctly calculating torque layer indexes, by using first the normal layers
Merge branch 'privacy-maps' of https://github.com/CartoDB/cartodb into privacy-maps