added the correct file upload button, got rid of the upload button in the bar and put it above the table
Merge branch 'master' of https://github.com/rbirdman/Dropbox