Merge
Merge remote-tracking branch 'scambio/master'

Conflicts:
	RegistratoreGrafica/src/Database.java