Merge branch 'develop' into chart_consumes_api

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

django/website/data_layer/models.py

django/website/hid/assets.py

...website/hid/migrations/0002_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/tables.py

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

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

django/website/hid/templates/hid/sources.html

.../website/hid/templates/hid/tests/select_all_checkbox.html

django/website/hid/templates/hid/view.html

django/website/hid/tests/categorize_items_tests.py

django/website/hid/tests/itemtable_tests.py

django/website/hid/tests/util_javascript_tests.py

django/website/hid/tests/views_tests.py

django/website/hid/views.py

django/website/media/less/internews.less

django/website/media/less/sources.less

django/website/media/less/view-edit.less