Latest charts
End of day commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	global/js/lib/plugins.js
Update