Merge branch 'develop' into data-layer-techdebt

deploy/project_settings.py

...o/website/dashboard/templates/dashboard/widget-error.html

...ashboard/templates/dashboard/widget-missing-template.html

django/website/dashboard/templatetags/render_widget.py

django/website/dashboard/tests/widget_tests.py

django/website/dashboard/views.py

django/website/dashboard/widget_pool.py

.../website/data_layer/migrations/0004_auto_20150720_1723.py

django/website/data_layer/models.py

django/website/hid/__init__.py

django/website/hid/assets.py

...website/hid/migrations/0002_rename_question_type_terms.py

...website/hid/migrations/0003_rename_question_type_terms.py

django/website/hid/static/hid/js/automatic_file_upload.js

django/website/hid/static/hid/js/select_all_checkbox.js

django/website/hid/static/hid/widgets/chart.js

django/website/hid/tables.py

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

django/website/hid/templates/hid/item.html

...ite/hid/templates/hid/select_item_id_checkbox_column.html