enabled graph legend
Merge branch 'develop' into refactor/add-legend-to-graph

Conflicts:
	app/views/dashboard/dashboard.html
Merge pull request #391 from musamusa/refactor/add-legend-to-graph

enabled graph legend