Igor_Sychev
7d43c228fc
Merge branch 'dev' into igorsychev/ocelot
# Conflicts:
# src/Services/Basket/Basket.API/Basket.API.csproj
# src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs
# src/Services/Catalog/Catalog.API/Catalog.API.csproj
# src/Services/Identity/Identity.API/Identity.API.csproj
# src/Services/Location/Locations.API/Locations.API.csproj
# src/Services/Marketing/Marketing.API/Marketing.API.csproj
# src/Services/Ordering/Ordering.API/Ordering.API.csproj
# src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
# src/Services/Payment/Payment.API/Payment.API.csproj