Merge branch 'django22-spike' into 'staging'

...wshid/data_layer/migrations/0011_message_feedback_type.py

...rnewshid/data_layer/migrations/0012_auto_20181205_1417.py

...rnewshid/data_layer/migrations/0013_auto_20181213_1153.py

...ata_layer/migrations/0014_remove_message_feedback_type.py

internewshid/data_layer/migrations/0015_customconstance.py

...newshid/data_layer/migrations/0016_message_internal_id.py

...rnewshid/data_layer/migrations/0017_auto_20190523_2245.py

...rnewshid/data_layer/migrations/0018_auto_20190530_2152.py

...ewshid/data_layer/migrations/0019_message_sub_location.py

...hid/data_layer/migrations/0020_message_collection_type.py

...rnewshid/data_layer/migrations/0021_auto_20191216_1007.py

...wshid/data_layer/migrations/0022_remove_message_source.py

internewshid/data_layer/models.py

internewshid/data_layer/tests/item_tests.py

internewshid/hid/fixtures/bangladesh-refugee-crisis.json

...shid/hid/fixtures/liberia-ebola-spreadsheet-profiles.json

internewshid/hid/fixtures/liberia-ebola.json

internewshid/hid/fixtures/spreadsheet-profiles.json

internewshid/hid/migrations/0001_initial.py

internewshid/hid/migrations/0001_question_types.py