commit
fixed merge conflict
Merge branch 'master' of https://github.com/StefanoFiumara/Utilities

Conflicts:
	Fano/fano/utils/ToolTip.as