Some changes

Pb with the balance and amount
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/src/configuration/DBConfig.java