CDB-1613 Moved retrieval of Layer Presenter inside it, bugfix of layer number for torque counting base layer too
Merge branch 'privacy-maps' of https://github.com/CartoDB/cartodb into privacy-maps