Merge branch 'marketingcampaign' of https://github.com/dotnet-architecture/eShopOnContainers into marketingcampaign

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

src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs

@@ -9,7 +9,7 @@
     using System.Collections.Generic;
 
     [Route("api/v1/[controller]")]
-    //[Authorize]
+    [Authorize]
     public class CampaignsController : Controller
     {
         private readonly MarketingContext _context;
@@ -19,7 +19,6 @@
             _context = context;
         }
 
-
         [HttpGet]
         public async Task<IActionResult> GetAllCampaigns()
         {