colored axis, adjusted graph interval
Merge remote-tracking branch 'origin/master'

Conflicts:
	extension/app/css/style.css