Merge "Fix classname mismatch between upload js and templates/thumbnail.html"