Support multi-types for graph
Some modif
Merge branch 'dev' of https://github.com/frco9/ecobox into dev

Conflicts:
	app/views/home/index.html.erb
	db/schema.rb
	lib/tasks/sample_more_data.rake