Colors on chart, bug fixes
Merge branch 'master' of https://github.com/tsaxton/datatrack

Conflicts:
	templates/header.php