bho non so perché non me lo commit correttamente
Merge remote-tracking branch 'origin/AdisysServer_MAVEN' into AdisysServer_MAVEN

Conflicts:
	database/ADISysDB.properties
	database/test/ADISysDB.properties
sss