update data.js
Merge branch 'master' into fix-#36

Conflicts:
	charts/js/data.js