Nuevas imagenes de sucursales
Reconexion
Merge branch 'master' of github.com:aguilarcarlos/saladfreshv2 into dev
Modificacion de categories
Merge branch 'dev'

Conflicts:
	.gitignore