Minor changes to dashboard
Merge branch 'master' of https://github.com/UQ-UQx/dashboard

Conflicts:
	.gitignore
	.idea/workspace.xml
	dashboard/urls.pyc
	dashboard/views.pyc
	dashboard/visualization.py
	dashboard/visualization.pyc
	uqxdashboard/settings.pyc