test branch
merge
Merge branch 'knowlet-master'
Merge https://github.com/Os-carsun/elementCheckToolTip

Conflicts:
	js/main.js