Updates to File Uploading dialog
Merge remote-tracking branch 'Databox/master'