cambios

ventanas de reportes que faltaban
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/Vistas/Registro.java
	src/Vistas/SalidaMercaderia.form