Merge remote-tracking branch 'origin/master'

Conflicts:
	4.- Código/AnaIsRepo/src/View/ViewAdministrarProductos.java
	4.- Código/AnaIsRepo/src/View/ViewProducto.java
asas

as
Merge remote-tracking branch 'origin/master'

Conflicts:
	4.- Código/AnaIsRepo/nbproject/private/private.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	4.- Código/AnaIsRepo/nbproject/private/private.xml
as

as