CDB-4048
Merge pull request #742 from CartoDB/CDB-4048

CDB-4048
CDB-4051
CDB-4051
Merge pull request #743 from CartoDB/CDB-4051

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

Added trimming to merge SQL query
CDB-4053 #close - fixed problems with bar progress and files bigger than user available quota
CDB-3792 #close - Changed text when file is downloaded from a location
Merge pull request #745 from CartoDB/CDB-4053

Fixed problems with bar progress and files bigger than user available quota
Merge branch 'CDB-3913' into CDB-4025
CDB-4025