Merge branch 'master' into netcore2.0

src/Web/Views/Shared/_Layout.cshtml

@@ -7,8 +7,8 @@
 
 	<environment names="Development">
 		<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
-        <link rel="stylesheet" href="~/css/app.css" />
-    </environment>
+		<link rel="stylesheet" href="~/css/app.css" />
+	</environment>
 	<environment names="Staging,Production">
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"
 			  asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
@@ -18,7 +18,7 @@
     <link rel="stylesheet" href="~/css/app.component.css" />
     <link rel="stylesheet" href="~/css/basket/basket.component.css" />
     <link rel="stylesheet" href="~/css/catalog/pager.css" />
-	<link rel="stylesheet" href="~/css/catalog/catalog.component.css" />
+  	<link rel="stylesheet" href="~/css/catalog/catalog.component.css" />
     <link rel="stylesheet" href="~/css/basket/basket-status/basket-status.component.css" />
     <link rel="stylesheet" href="~/css/orders/orders.component.css" />
 </head>