sync
Merge branch 'master' of https://github.com/sacdallago/it.unibz.inf.sesp.Task

Conflicts:
	testDesktop/Desktop/Desktop.pro.user