Yay there's now a graph!!!
Merge remote-tracking branch 'origin/ui' into ui

Conflicts:
	dashboard.html