charts
Merge remote-tracking branch 'origin/charts-dev'

Conflicts:
	includes/head.php