Merge remote-tracking branch 'origin/master'

Conflicts:
	fancytooltip.js
	fancytooltip.min.js