You can now specify segment color in data parameter
Merge branch 'master' of https://github.com/stlk/morris.js into stlk-master

Conflicts:
	morris.min.js