Merge remote-tracking branch 'origin/master'

Conflicts:
	BancoBac/build/classes/bancobac/BarraGraficos.class
	BancoBac/build/classes/bancobac/PastelGraficos.class
	BancoBac/nbproject/private/private.xml