change colors to grey!
make graphs grey
Merge branch 'master' into base_map

Conflicts:
	src/scripts/views/Chart.js
Merge branch 'master' into base_map