CDB-199 #fix duplicate asset upload
Merge branch 'master' of github.com:CartoDB/cartodb