AFV Update Kevin
Merge origin/master

Conflicts:
	www/js/charts.js