Sincronizando bajando cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/pabloariasmora/CargoDispatcher

Conflicts:
	.gitignore
Descargando actualizaciones
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	CargoDispatcher.v11.suo
	CargoDispatcherAD/AccesoDatos/FacturaAD.cs
	CargoDispatcherIU/CargoDispatcherIU.csproj.user
	CargoDispatcherIU/app/WEB/CrearContainer.aspx
	CargoDispatcherIU/app/WEB/CrearContainer.aspx.cs
	CargoDispatcherIU/app/WEB/CrearContenedor.aspx.designer.cs
	CargoDispatcherIU/app/WEB/CrearPaquetes.aspx
	CargoDispatcherIU/app/WEB/CrearPaquetes.aspx.cs
	CargoDispatcherIU/app/WEB/RecibirPaquete.aspx.designer.cs
	CargoDispatcherIU/app/WEB/Reporteria.aspx
	CargoDispatcherIU/app/WEB/Reporteria.aspx.cs
	CargoDispatcherIU/app/WEB/Reporteria.aspx.designer.cs