replaced torque
Merge branch 'feature/CDB-363_torque_integration' of github.com:CartoDB/cartodb.js into feature/CDB-363_torque_integration
Merge branch 'feature/CDB-363_torque_integration' of github.com:CartoDB/cartodb.js into feature/CDB-363_torque_integration
fixed time slider
added query to torque layers