Merge remote-tracking branch 'origin/master' into alex
Files e alertas fix

Guardar tambem o valor final, por causa da info das mercadorias
facturadas
Merge remote-tracking branch 'origin/alex'

Conflicts:
	ProjectoEDA/FileHandler.h