Merge branch 'develop' of github.com:aptivate/internewshid into password_reset

deploy/pip_packages.txt

django/website/chn_spreadsheet/importer.py

django/website/data_layer/models.py

django/website/data_layer/tests/item_tests.py

django/website/hid/forms/item.py

django/website/hid/migrations/0006_free_tag_taxonomy.py

django/website/hid/migrations/0007_free_tag_vocabulary.py

django/website/hid/tabs/view_and_edit_table.py

django/website/hid/tests/add_edit_item_view_tests.py

django/website/hid/tests/categorize_items_tests.py

django/website/hid/tests/views_tests.py

django/website/hid/views/item.py

django/website/rest_api/tests/categorize_items_tests.py

django/website/rest_api/tests/free_tagging_tests.py

django/website/rest_api/tests/item_list_view_tests.py

django/website/rest_api/tests/item_update_tests.py

.../website/rest_api/tests/taxonomy_and_term_create_tests.py

django/website/rest_api/tests/term_itemcount_tests.py

django/website/rest_api/views.py

django/website/taxonomies/exceptions.py