Added Dropbox upload and Download function
Merge branch 'master' into Adam