wsada
Merge branch 'master' of https://github.com/dmsierra11/FranquiciaApp

Conflicts:
	listaProductos.xml
	sucursal1.xml