Factura Data
Merge remote-tracking branch 'origin/master'

Conflicts:
	Proyecto Opticas - Prog. Patrones/nbproject/private/private.properties