can now get list of files in dropbox folder
fixed merge errors