Merge pull request #1247 from garnertb/master

Added support for Basic authentication end-to-end headers to the proxy view.
Added parent template references for block extra_head in a couple templates where missing
Merge pull request #1248 from mwengren/fix_template_inheritance

Fix missing parent template references in a few template files.
Small js and html improvements to the incomplete uploads section of the upload page.