Fix merge conflict
Don't fail if there is no extension
Don't throw exception if anything fails when sending Ducksboard events
CDB-199 #fix duplicate asset upload
Merge branch 'master' of github.com:CartoDB/cartodb
Merge branch 'master' into develop