Merge branch 'django22-spike' into 'staging'

internewshid/hid/views/item.py

internewshid/hid/views/upload_spreadsheet.py

internewshid/local_settings.py.dev

internewshid/local_settings.py.drc

internewshid/local_settings.py.gitlab

internewshid/local_settings.py.production

internewshid/local_settings.py.staging

internewshid/local_settings.py.sudan

internewshid/local_settings.py.uganda

internewshid/mail/__init__.py

internewshid/mail/tests/notify_test.py

internewshid/rest_api/serializers.py

internewshid/rest_api/tests/categorize_items_tests.py

internewshid/rest_api/tests/delete_all_terms_tests.py

internewshid/rest_api/tests/free_tagging_tests.py

internewshid/rest_api/tests/item_create_view_tests.py

internewshid/rest_api/tests/item_delete_tests.py

internewshid/rest_api/tests/item_export_tests.py

internewshid/rest_api/tests/item_list_view_tests.py

internewshid/rest_api/tests/item_update_tests.py