Merge branch 'develop' into ui-bug-fixes

django/website/hid/tables.py

django/website/hid/templates/hid/categories_column.html

django/website/hid/templates/hid/view.html

django/website/hid/templates/hid/view_and_edit_buttons.html

django/website/hid/tests/categorize_items_tests.py

django/website/hid/tests/itemtable_tests.py

django/website/hid/tests/login_tests.py

django/website/hid/tests/views_tests.py

django/website/hid/views.py

django/website/media/less/view-edit.less

django/website/settings.py