Conflicts:
	django/website/dashboard/templates/dashboard/basic-text-widget.html
	django/website/local_settings.py.dev