Merge branch 'staging' into setup-instructions

.gitlab-ci.yml

Pipfile

Pipfile.lock

internewshid/chn_spreadsheet/importer.py

...hid/chn_spreadsheet/migrations/0015_auto_20200309_1832.py

...t/migrations/0015_delete_etc_and_kobo_master_importers.py

...id/chn_spreadsheet/migrations/0016_merge_20200309_1844.py

internewshid/chn_spreadsheet/tests/etc_tests.py

internewshid/chn_spreadsheet/tests/importer_tests.py

internewshid/chn_spreadsheet/tests/kobo_master_tests.py

internewshid/dashboard/migrations/0004_auto_20200309_1832.py

...rnewshid/data_layer/migrations/0023_auto_20200309_1832.py

internewshid/hid/filters.py

internewshid/hid/fixtures/drc.json

internewshid/hid/fixtures/spreadsheet-profiles.json

internewshid/hid/fixtures/sudan.json

internewshid/hid/fixtures/taxonomies-french.json

internewshid/hid/fixtures/taxonomies.json

internewshid/hid/tests/filter_tests.py

internewshid/hid/tests/views_tests.py