Fix extra set of vars the duplicated realtime graph
Merge branch 'master' into graph-labels-locale

Conflicts:
	web/assets/javascripts/dashboard.js