Merge pull request #204 from nla/fix_sorting

fix the sort by filename button.
Merge pull request #205 from nla/save_file_software

add the device and software id to file uploads
Merge branch 'master' into save_file_software