Merge branch 'django22-spike' into 'staging'

internewshid/chn_spreadsheet/tests/geopoll_tests.py

internewshid/chn_spreadsheet/tests/importer_tests.py

internewshid/chn_spreadsheet/tests/kobo_master_tests.py

internewshid/chn_spreadsheet/tests/kobo_tests.py

internewshid/chn_spreadsheet/tests/model_tests.py

internewshid/chn_spreadsheet/tests/rapidpro_tests.py

internewshid/dashboard/migrations/0001_initial.py

internewshid/dashboard/migrations/0002_auto_20150709_1244.py

...ewshid/dashboard/migrations/0003_widgetinstance_height.py

internewshid/dashboard/models.py

internewshid/data_layer/migrations/0001_initial.py

...rnewshid/data_layer/migrations/0002_auto_20150619_2132.py

internewshid/data_layer/migrations/0003_message_terms.py

...rnewshid/data_layer/migrations/0004_auto_20150720_1723.py

...wshid/data_layer/migrations/0005_message_last_modified.py

...id/data_layer/migrations/0006_message_network_provider.py

...newshid/data_layer/migrations/0007_message_translation.py

...rnewshid/data_layer/migrations/0008_auto_20181011_1149.py

internewshid/data_layer/migrations/0009_message_location.py

...rnewshid/data_layer/migrations/0010_auto_20181204_1259.py