last changes
next steps with new torque dragging
cdb conflict solved + 363 branch updated
finishing new sortable actions in right panel
Merge branch 'feature/CDB-363' into feature/torque-layer-drag
removed unnecessary variables from new-layer-dialog if upgrades message won't show up in any case
Merge branch 'feature/CDB-363' of github.com:CartoDB/cartodb20 into feature/CDB-363