Added trimming to merge SQL query
Merge pull request #744 from CartoDB/CDB-3782

Added trimming to merge SQL query
Merge pull request #745 from CartoDB/CDB-4053

Fixed problems with bar progress and files bigger than user available quota
Merge branch 'master' into CDB-3625
Default geocoder pane done