# Conflicts:
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs

# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln

Map Position to Locations APi
Update current user location

MVC app now waits other containers

Set internal urls in k8s config for pod communication

Change grace period time  to 1 minute
Remove unecessary clean basket methods on client

Minor cold clean up to avoid unnecessary code execution

Packages update to 1.1.* and Swagger update

also from csproj files excluded direct specification of runtime to make compile happy if on a system we have higher version.

Redis and RabbitMQ also updated
Identity server changes reflectiong  ac59db6e16 commit