Add per-expression legend string functionality
Merge pull request #161 from prometheus/per-expression-legends

Per-expression legend string
Merge branch 'master' into directories

Conflicts:
	db/schema.rb
	spec/features/graph_spec.rb
fix dashboard json file name in dashboard factory