Merge branch 'develop' into last_modified

django/website/dashboard/templatetags/render_widget.py

django/website/dashboard/tests/widget_tests.py

django/website/dashboard/widget_pool.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/templates/hid/widgets/table.html

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/settings.py

django/website/transport/taxonomies.py

.../website/transport/tests/taxonomy_term_itemcount_tests.py