Merge branch 'develop' into view_and_edit_page_the_return

...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

django/website/hid/__init__.py

django/website/hid/tests/chart_widget_tests.py

django/website/hid/tests/login_tests.py

django/website/hid/tests/term_count_widget_tests.py

django/website/hid/views.py

django/website/hid/widgets/term_count_chart.py

django/website/settings.py