DifY Hover  correction
Merge remote-tracking branch 'origin/master'

Conflicts:
	framework/framework.js