Merge branch 'django22-spike' into 'staging'

...newshid/hid/migrations/0002_rename_question_type_terms.py

...newshid/hid/migrations/0003_rename_question_type_terms.py

internewshid/hid/migrations/0004_item_types.py

internewshid/hid/migrations/0005_initial_tabbed_page.py

internewshid/hid/migrations/0006_free_tag_taxonomy.py

internewshid/hid/migrations/0007_free_tag_vocabulary.py

internewshid/hid/migrations/0008_origin_taxonomy.py

internewshid/hid/migrations/0009_country_taxonomy.py

internewshid/hid/migrations/0010_context_taxonomy.py

internewshid/hid/migrations/0011_remove_ebola_questions.py

internewshid/hid/migrations/0012_auto_20181019_1559.py

internewshid/hid/tables.py

internewshid/hid/tabs/view_and_edit_table.py

internewshid/hid/tests/add_edit_item_view_tests.py

internewshid/hid/tests/categorize_items_tests.py

internewshid/hid/tests/fast_dispatch.py

internewshid/hid/tests/login_tests.py

internewshid/hid/tests/site_needs_authentication_tests.py

internewshid/hid/tests/term_count_widget_tests.py

internewshid/hid/tests/upload_view_tests.py