dropbox api -> linkType change added
Merge branch 'release/2.6.1' of github.com:CartoDB/cartodb into release/2.6.1