Merge branch 'develop' into bar_chart_unknown

django/website/chn_spreadsheet/importer.py

.../chn_spreadsheet/migrations/0005_update_geopoll_config.py

...chn_spreadsheet/migrations/0006_update_rapidpro_config.py

...chn_spreadsheet/migrations/0007_update_rapidpro_config.py

django/website/chn_spreadsheet/tests/geopoll_tests.py

django/website/chn_spreadsheet/tests/importer_tests.py

django/website/chn_spreadsheet/tests/rapidpro_tests.py

...te/data_layer/migrations/0006_message_network_provider.py

django/website/data_layer/models.py

django/website/hid/migrations/0004_item_types.py

django/website/hid/tables.py

django/website/hid/templates/hid/categories_column.html

django/website/transport/tests/taxonomy_list_tests.py