Cimmot pequeño
Merge remote-tracking branch 'origin/master' into marco-rodriguez

Conflicts:
	BECA2/UI/Frm_ReporteProforma.vb
Merge remote-tracking branch 'origin/marco-rodriguez'

Conflicts:
	BECA2/UI/Frm_ReporteProforma.vb