Merge pull request #15 from armenzg/master

Bug 986112 - Switch from uploaded_files.txt to uploaded_files.json