Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	CargoDispatcher.v11.suo
	CargoDispatcherAD/bin/Debug/CargoDispatcherAD.pdb
	CargoDispatcherAD/bin/Debug/UtilitariosCD.pdb
	CargoDispatcherAD/obj/Debug/CargoDispatcherAD.pdb
	RestfulSVC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	UtilitariosCD/bin/Debug/UtilitariosCD.pdb
	UtilitariosCD/obj/Debug/UtilitariosCD.pdb
Merge remote-tracking branch 'origin/master'

Conflicts:
	CargoDispatcher.v11.suo
	CargoDispatcherAD/bin/Debug/CargoDispatcherAD.pdb
	CargoDispatcherAD/bin/Debug/UtilitariosCD.pdb
	CargoDispatcherAD/obj/Debug/CargoDispatcherAD.pdb
	RestfulSVC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	UtilitariosCD/bin/Debug/UtilitariosCD.pdb
	UtilitariosCD/obj/Debug/UtilitariosCD.pdb
Merge remote-tracking branch 'origin/master'

Conflicts:
	CargoDispatcher.v11.suo
	CargoDispatcherAD/bin/Debug/CargoDispatcherAD.pdb
	CargoDispatcherAD/bin/Debug/UtilitariosCD.pdb
	CargoDispatcherAD/obj/Debug/CargoDispatcherAD.pdb
	RestfulSVC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	UtilitariosCD/bin/Debug/UtilitariosCD.pdb
	UtilitariosCD/obj/Debug/UtilitariosCD.pdb