Completed the file uploader component

#1059
Merge remote branch 'upstream/master'