fixed CDB-2611
Merge branch 'CDB-1555' of github.com:CartoDB/cartodb into CDB-1555
updated cdb
removed unnused dependency
added statcs to recompilation