prova nuove configurazioni git
Merge remote-tracking branch 'origin/ADISysServer_Patologia' into ADISysServer_Patologia

Conflicts:
	database/ADISysDB.properties
	database/ADISysDB.script
	database/test/ADISysDB.log
	database/test/ADISysDB.properties
	database/test/ADISysDB.script