wqefddf
Merge branch 'master' of https://github.com/GraLucena/SucursalApp

Conflicts:
	build/built-jar.properties
	listaProductos.xml
	src/sockets/Replicador.java
	src/ventanas/GestionInventario.java
	src/ventanas/LoginSucursal.java
	sucursal2.xml
Arreglos en sucursal