Use locale labels for dashboard graphs
Merge branch 'master' into graph-labels-locale

Conflicts:
	web/assets/javascripts/dashboard.js
Merge pull request #1728 from mperham/graph-labels-locale

Use locale labels for dashboard graphs