Preliminary infotips for animation settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	heatmap/index.html