Merge branch 'UserQuotaFunction' of https://github.com/strk/cartodb into CDB-2920
CDB-2920 applied patch to call SQL cartodbfy function
Merge branch 'master' into CDB-2920

Conflicts:
	lib/tasks/db_maintenance.rake
CDB-2920 wrong code selected, reverting to correct one
Merge pull request #462 from CartoDB/CDB-2920

Tested in staging, going live