Merge branch 'develop' into rest_api_test

django/website/dashboard/templatetags/render_widget.py

django/website/dashboard/tests/widget_tests.py

django/website/dashboard/widget_pool.py

...bsite/data_layer/migrations/0005_message_last_modified.py

django/website/data_layer/models.py

django/website/data_layer/tests/item_tests.py

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

django/website/hid/templates/hid/tests/chart.html

django/website/hid/templates/hid/widgets/chart.html

django/website/hid/tests/categorize_items_tests.py

django/website/hid/tests/term_count_widget_tests.py

django/website/hid/widgets/term_count_chart.py

django/website/media/less/internews.less

django/website/rest_api/tests/categorize_items_tests.py

django/website/rest_api/views.py

django/website/settings.py

django/website/taxonomies/models.py

django/website/transport/items.py

django/website/transport/tests/item_add_term_tests.py