some tooltips
Merge branch 'master' into table
Updated + fix

Conflicts:
	avg-mark.js