Merge branch 'fix_upload_button' into make_view_edit_view_into_tab

django/website/hid/forms.py

django/website/hid/tabs/view_and_edit_table.py

django/website/hid/tests/upload_view_tests.py

django/website/hid/tests/views_tests.py

django/website/hid/views.py

django/website/tabbed_page/templatetags/render_tab.py

django/website/tabbed_page/tests/render_tests.py

django/website/tabbed_page/views.py