Stacked area chart now uses timezone data; rejigged layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/scripts/makeCharts.js