diff --git a/CSharp/Blog-CustomChannelData/azuredeploy.json b/CSharp/Blog-CustomChannelData/azuredeploy.json
new file mode 100644
index 0000000000..03eb2ffe37
--- /dev/null
+++ b/CSharp/Blog-CustomChannelData/azuredeploy.json
@@ -0,0 +1,121 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "CSharp/Blog-CustomChannelData"
+    },
+    "MicrosoftAppId": {
+      "type": "string"
+    },
+    "MicrosoftAppPassword": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "MicrosoftAppId",
+                "value": "[parameters('MicrosoftAppId')]"
+              },
+              {
+                "name": "MicrosoftAppPassword",
+                "value": "[parameters('MicrosoftAppPassword')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/Web.config b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/Web.config
index a35c784f28..cf7e6d928e 100644
--- a/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/Web.config
+++ b/CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot/Web.config
@@ -10,8 +10,8 @@
     <add key="MicrosoftAppId" value="" />
     <add key="MicrosoftAppPassword" value="" />
 
-    <add key="LUIS_SubscriptionKey" value="YourSubscriptionKey" />
-    <add key="LUIS_ModelId" value="YourModelId" />
+    <add key="LUIS_SubscriptionKey" value="" />
+    <add key="LUIS_ModelId" value="" />
   </appSettings>
   <!--
     For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
diff --git a/CSharp/Blog-LUISActionBinding/README.md b/CSharp/Blog-LUISActionBinding/README.md
index 2505b331a5..ac10de4218 100644
--- a/CSharp/Blog-LUISActionBinding/README.md
+++ b/CSharp/Blog-LUISActionBinding/README.md
@@ -2,6 +2,11 @@
 
 A sample that contains a core implementation for doing LUIS Action Binding using the [Microsoft.Cognitive.LUIS.ActionBinding](Microsoft.Cognitive.LUIS.ActionBinding) framework in order to handle LUIS intents taking a service result as input. In addition, the solution contains sample Actions ([LuisActions.Samples.Shared](LuisActions.Samples.Shared)) that are commonly shared, and shows how to integrate them in a console, a bot and a ASP.NET MVC applications.
 
+[![Deploy to Azure][Deploy Button]][Deploy CSharp/LUISActionBinding]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy CSharp/LUISActionBinding]: https://azuredeploy.net
+
 ### Prerequisites
 
 The minimum prerequisites to run this sample are:
diff --git a/CSharp/Blog-LUISActionBinding/azuredeploy.json b/CSharp/Blog-LUISActionBinding/azuredeploy.json
new file mode 100644
index 0000000000..e882f0f1eb
--- /dev/null
+++ b/CSharp/Blog-LUISActionBinding/azuredeploy.json
@@ -0,0 +1,135 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "CSharp/Blog-LUISActionBinding/LuisActions.Samples.Bot"
+    },
+    "MicrosoftAppId": {
+      "type": "string"
+    },
+    "MicrosoftAppPassword": {
+      "type": "string"
+    },
+    "LUIS_SubscriptionKey": {
+      "type": "string"
+    },
+    "LUIS_ModelId": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "MicrosoftAppId",
+                "value": "[parameters('MicrosoftAppId')]"
+              },
+              {
+                "name": "MicrosoftAppPassword",
+                "value": "[parameters('MicrosoftAppPassword')]"
+              },
+              {
+                "name": "LUIS_SubscriptionKey",
+                "value": "[parameters('LUIS_SubscriptionKey')]"
+              },
+              {
+                "name": "LUIS_ModelId",
+                "value": "[parameters('LUIS_ModelId')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CSharp/capability-SimpleTaskAutomation/README.md b/CSharp/capability-SimpleTaskAutomation/README.md
index 6914935c09..1c497a17cf 100644
--- a/CSharp/capability-SimpleTaskAutomation/README.md
+++ b/CSharp/capability-SimpleTaskAutomation/README.md
@@ -2,6 +2,11 @@
 
 A sample bot showing how to do simple task automation scenarios.
 
+[![Deploy to Azure][Deploy Button]][Deploy CSharp/SimpleTaskAutomation]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy CSharp/SimpleTaskAutomation]: https://azuredeploy.net
+
 ### Prerequisites
 
 The minimum prerequisites to run this sample are:
diff --git a/CSharp/capability-SimpleTaskAutomation/azuredeploy.json b/CSharp/capability-SimpleTaskAutomation/azuredeploy.json
new file mode 100644
index 0000000000..db6e8c41f0
--- /dev/null
+++ b/CSharp/capability-SimpleTaskAutomation/azuredeploy.json
@@ -0,0 +1,121 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "CSharp/capability-SimpleTaskAutomation"
+    },
+    "MicrosoftAppId": {
+      "type": "string"
+    },
+    "MicrosoftAppPassword": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "MicrosoftAppId",
+                "value": "[parameters('MicrosoftAppId')]"
+              },
+              {
+                "name": "MicrosoftAppPassword",
+                "value": "[parameters('MicrosoftAppPassword')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CSharp/core-BasicMultiDialog/README.md b/CSharp/core-BasicMultiDialog/README.md
index ce1684d234..f30de2750d 100644
--- a/CSharp/core-BasicMultiDialog/README.md
+++ b/CSharp/core-BasicMultiDialog/README.md
@@ -2,7 +2,12 @@
 
 A sample that shows how to use the [Dialog](https://docs.microsoft.com/en-us/bot-framework/dotnet/bot-builder-dotnet-dialogs) system in the [Bot Builder for .NET SDK](https://dev.botframework.com/)  to manage a bot's conversation with the user.
 
-In this sample, we'll use the Dialog system to ask the user their name and age, and reply with their reponses.
+In this sample, we'll use the Dialog system to ask the user their name and age, and reply with their responses.
+
+[![Deploy to Azure][Deploy Button]][Deploy CSharp/BasicMultiDialog]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy CSharp/BasicMultiDialog]: https://azuredeploy.net
 
 ### Prerequisites
 
diff --git a/CSharp/core-BasicMultiDialog/azuredeploy.json b/CSharp/core-BasicMultiDialog/azuredeploy.json
new file mode 100644
index 0000000000..9e9c07d5fb
--- /dev/null
+++ b/CSharp/core-BasicMultiDialog/azuredeploy.json
@@ -0,0 +1,121 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "CSharp/core-BasicMultiDialog"
+    },
+    "MicrosoftAppId": {
+      "type": "string"
+    },
+    "MicrosoftAppPassword": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "MicrosoftAppId",
+                "value": "[parameters('MicrosoftAppId')]"
+              },
+              {
+                "name": "MicrosoftAppPassword",
+                "value": "[parameters('MicrosoftAppPassword')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CSharp/core-GlobalMessageHandlers/README.md b/CSharp/core-GlobalMessageHandlers/README.md
index 366110a9db..e9d448550b 100644
--- a/CSharp/core-GlobalMessageHandlers/README.md
+++ b/CSharp/core-GlobalMessageHandlers/README.md
@@ -6,6 +6,11 @@ This sample shows how to create global message handlers and illustrates two comm
 * Global Dialogs - A global message handler that responds to a global command to add a dialog to the conversation from anywhere in the bot. In this sample, the settings dialog can be accessed anywhere in the bot by replying with 'settings' anywhere in the bot. When the settings dialog is complete, the conversation returns to the prior dialog. 
 * Stack Manipulation - A global message handler that responds to a global command to manipulate the dialog stack. In this sample, the user is returned to the root dialog whenever the user responds with the word 'cancel' anywhere in the bot.
 
+[![Deploy to Azure][Deploy Button]][Deploy CSharp/GlobalMessageHandlers]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy CSharp/GlobalMessageHandlers]: https://azuredeploy.net
+
 ### Prerequisites
 
 To run this sample, install the prerequisites by following the steps in the [Create a bot with the Bot Builder SDK for .NET](https://docs.microsoft.com/en-us/bot-framework/dotnet/bot-builder-dotnet-quickstart) section of the documentation.
diff --git a/CSharp/core-GlobalMessageHandlers/azuredeploy.json b/CSharp/core-GlobalMessageHandlers/azuredeploy.json
new file mode 100644
index 0000000000..05275168ba
--- /dev/null
+++ b/CSharp/core-GlobalMessageHandlers/azuredeploy.json
@@ -0,0 +1,121 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "CSharp/core-GlobalMessageHandlers"
+    },
+    "MicrosoftAppId": {
+      "type": "string"
+    },
+    "MicrosoftAppPassword": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "MicrosoftAppId",
+                "value": "[parameters('MicrosoftAppId')]"
+              },
+              {
+                "name": "MicrosoftAppPassword",
+                "value": "[parameters('MicrosoftAppPassword')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CSharp/core-Middleware/README.md b/CSharp/core-Middleware/README.md
index 9329d8aede..8c0cc284a1 100644
--- a/CSharp/core-Middleware/README.md
+++ b/CSharp/core-Middleware/README.md
@@ -2,6 +2,11 @@
 
 A sample bot showing how to intercept messages and log them.
 
+[![Deploy to Azure][Deploy Button]][Deploy CSharp/MiddlewareLogging]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy CSharp/MiddlewareLogging]: https://azuredeploy.net
+
 ### Prerequisites
 
 The minimum prerequisites to run this sample are:
diff --git a/CSharp/demo-CardsAttachments/public-TestBot/azuredeploy.json b/CSharp/core-Middleware/azuredeploy.json
similarity index 98%
rename from CSharp/demo-CardsAttachments/public-TestBot/azuredeploy.json
rename to CSharp/core-Middleware/azuredeploy.json
index 3e27e95cb9..4a4ac5e979 100644
--- a/CSharp/demo-CardsAttachments/public-TestBot/azuredeploy.json
+++ b/CSharp/core-Middleware/azuredeploy.json
@@ -39,7 +39,7 @@
     },
     "Project": {
       "type": "string",
-      "defaultValue": "CSharp/cards-RichCards"
+      "defaultValue": "CSharp/core-Middleware"
     },
     "MicrosoftAppId": {
       "type": "string"
diff --git a/CSharp/demo-CardsAttachments/README.md b/CSharp/demo-CardsAttachments/README.md
index 455f2fde41..346a2cd865 100644
--- a/CSharp/demo-CardsAttachments/README.md
+++ b/CSharp/demo-CardsAttachments/README.md
@@ -1,6 +1,6 @@
 # Cards as Attachments Sample Bot
 
-A sample bot to renders several types of cards as attachments, while also showing the generated JSON for each one of these cards at the message's payload, and the C# and NodeJs code required to build them.
+A sample bot that renders several types of cards as attachments, while also showing the generated JSON for each one of these cards at the message's payload, and the C# and NodeJs code required to build them.
 
 [![Deploy to Azure][Deploy Button]][Deploy CSharp/CardAttachments]
 
diff --git a/CSharp/demo-CardsAttachments/azuredeploy.json b/CSharp/demo-CardsAttachments/azuredeploy.json
new file mode 100644
index 0000000000..0889530f48
--- /dev/null
+++ b/CSharp/demo-CardsAttachments/azuredeploy.json
@@ -0,0 +1,128 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "CSharp/demo-CardsAttachments/public-TestBot"
+    },
+    "MicrosoftAppId": {
+      "type": "string"
+    },
+    "MicrosoftAppPassword": {
+      "type": "string"
+    },
+    "DirectLineSecret": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "MicrosoftAppId",
+                "value": "[parameters('MicrosoftAppId')]"
+              },
+              {
+                "name": "MicrosoftAppPassword",
+                "value": "[parameters('MicrosoftAppPassword')]"
+              },
+              {
+                "name": "DirectLineSecret",
+                "value": "[parameters('DirectLineSecret')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CSharp/demo-CardsAttachments/public-TestBot/Assets/CSharpCode.xml b/CSharp/demo-CardsAttachments/public-TestBot/Assets/CSharpCode.xml
index 08e50e1ece..8558b0de61 100644
--- a/CSharp/demo-CardsAttachments/public-TestBot/Assets/CSharpCode.xml
+++ b/CSharp/demo-CardsAttachments/public-TestBot/Assets/CSharpCode.xml
@@ -19,7 +19,8 @@
         }
     }.ToAttachment()
 };
-        ]]></command>
+        }
+    ]]></command>
   <command type="AudioCardScorable"><![CDATA[message.Attachments = new List<Attachment>
 {
     new AudioCard
@@ -58,7 +59,7 @@
         Subtitle = "Your bots — wherever your users are talking",
         Text = "Build and connect intelligent bots to interact with your users naturally wherever they are, from text/sms to Skype, Slack, Office 365 mail and other popular services.",
         Images = new List<CardImage> { new CardImage("https://sec.ch9.ms/ch9/7ff5/e07cfef0-aa3b-40bb-9baa-7c9ef8ff7ff5/buildreactionbotframework_960.jpg") },
-        Buttons = new List<CardAction> { new CardAction(ActionTypes.OpenUrl, "Get Started", value: "https://docs.microsoft.com/bot-framework/") }
+        Buttons = new List<CardAction> { new CardAction(ActionTypes.OpenUrl, "Get Started", value: "https://docs.microsoft.com/bot-framework") }
     }.ToAttachment(),
     new ThumbnailCard
     {
@@ -66,7 +67,7 @@
         Subtitle = "Your bots — wherever your users are talking",
         Text = "Build and connect intelligent bots to interact with your users naturally wherever they are, from text/sms to Skype, Slack, Office 365 mail and other popular services.",
         Images = new List<CardImage> { new CardImage("https://sec.ch9.ms/ch9/7ff5/e07cfef0-aa3b-40bb-9baa-7c9ef8ff7ff5/buildreactionbotframework_960.jpg") },
-        Buttons = new List<CardAction> { new CardAction(ActionTypes.OpenUrl, "Get Started", value: "https://docs.microsoft.com/bot-framework/") }
+        Buttons = new List<CardAction> { new CardAction(ActionTypes.OpenUrl, "Get Started", value: "https://docs.microsoft.com/bot-framework") }
     }.ToAttachment(),
     new AnimationCard
     {
@@ -111,7 +112,8 @@
         }
     }.ToAttachment()
 };
-        ]]></command>
+        }
+    ]]></command>
   <command type="HeroCardScorable"><![CDATA[message.Attachments = new List<Attachment>
 {
     new HeroCard
@@ -120,10 +122,11 @@
         Subtitle = "Your bots — wherever your users are talking",
         Text = "Build and connect intelligent bots to interact with your users naturally wherever they are, from text/sms to Skype, Slack, Office 365 mail and other popular services.",
         Images = new List<CardImage> { new CardImage("https://sec.ch9.ms/ch9/7ff5/e07cfef0-aa3b-40bb-9baa-7c9ef8ff7ff5/buildreactionbotframework_960.jpg") },
-        Buttons = new List<CardAction> { new CardAction(ActionTypes.OpenUrl, "Get Started", value: "https://docs.microsoft.com/bot-framework/") }
+        Buttons = new List<CardAction> { new CardAction(ActionTypes.OpenUrl, "Get Started", value: "https://docs.microsoft.com/bot-framework") }
     }.ToAttachment()
 };
-        ]]></command>
+        }
+    ]]></command>
   <command type="ReceiptCardScorable"><![CDATA[message.Attachments = new List<Attachment>
 {
     new ReceiptCard
@@ -165,10 +168,11 @@
         Subtitle = "Your bots — wherever your users are talking",
         Text = "Build and connect intelligent bots to interact with your users naturally wherever they are, from text/sms to Skype, Slack, Office 365 mail and other popular services.",
         Images = new List<CardImage> { new CardImage("https://sec.ch9.ms/ch9/7ff5/e07cfef0-aa3b-40bb-9baa-7c9ef8ff7ff5/buildreactionbotframework_960.jpg") },
-        Buttons = new List<CardAction> { new CardAction(ActionTypes.OpenUrl, "Get Started", value: "https://docs.microsoft.com/bot-framework/") }
+        Buttons = new List<CardAction> { new CardAction(ActionTypes.OpenUrl, "Get Started", value: "https://docs.microsoft.com/bot-framework") }
     }.ToAttachment()
 };
-        ]]></command>
+        }
+    ]]></command>
   <command type="VideoCardScorable"><![CDATA[message.Attachments = new List<Attachment>
 {
     new VideoCard
@@ -199,4 +203,4 @@
     }.ToAttachment()
 };
         ]]></command>
-</code>
+</code>
\ No newline at end of file
diff --git a/CSharp/demo-CardsAttachments/public-TestBot/TestBot.csproj b/CSharp/demo-CardsAttachments/public-TestBot/TestBot.csproj
index 82a0b37794..a87e43608d 100644
--- a/CSharp/demo-CardsAttachments/public-TestBot/TestBot.csproj
+++ b/CSharp/demo-CardsAttachments/public-TestBot/TestBot.csproj
@@ -43,55 +43,55 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
+      <HintPath>packages\Autofac.4.3.0\lib\net45\Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Chronic, Version=0.3.2.0, Culture=neutral, PublicKeyToken=3bd1f1ef638b0d3c, processorArchitecture=MSIL">
-      <HintPath>..\packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll</HintPath>
+      <HintPath>packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Bot.Builder, Version=3.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll</HintPath>
+      <HintPath>packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Bot.Builder.Autofac, Version=3.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll</HintPath>
+      <HintPath>packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Bot.Connector, Version=3.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll</HintPath>
+      <HintPath>packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.IdentityModel.Protocol.Extensions, Version=1.0.40306.1554, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll</HintPath>
+      <HintPath>packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.4.403061554\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
+      <HintPath>packages\Microsoft.Rest.ClientRuntime.2.3.4\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+      <HintPath>packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
+      <HintPath>packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.40306.1554, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+      <HintPath>packages\System.IdentityModel.Tokens.Jwt.4.0.4.403061554\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+      <HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
@@ -106,35 +106,35 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
+      <HintPath>packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
+      <HintPath>packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.Http.WebHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
+      <HintPath>packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
+      <HintPath>packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+      <HintPath>packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
+      <HintPath>packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+      <HintPath>packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+      <HintPath>packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
@@ -181,7 +181,9 @@
     <Compile Include="Scorables\RichCards\VideoCardScorable.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="packages.config" />
+    <Content Include="packages.config">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Views\Chat\Index.cshtml" />
     <Content Include="Views\Shared\Error.cshtml" />
     <Content Include="Views\Shared\_Layout.cshtml" />
@@ -225,7 +227,9 @@
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
-    <PreBuildEvent>$(SolutionDir)\SourceTool\$(OutDir)\$(ConfigurationName)\SourceTool.exe $(ProjectDir)\Scorables $(ProjectDir)\Assets</PreBuildEvent>
+    <PreBuildEvent>if '$(WEBSITE_SITE_NAME)' == '' (
+    $(SolutionDir)\..\SourceTool\$(OutDir)\$(ConfigurationName)\SourceTool.exe $(ProjectDir)\Scorables $(ProjectDir)\Assets
+)</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CSharp/demo-CardsAttachments/TestBot.sln b/CSharp/demo-CardsAttachments/public-TestBot/TestBot.sln
similarity index 87%
rename from CSharp/demo-CardsAttachments/TestBot.sln
rename to CSharp/demo-CardsAttachments/public-TestBot/TestBot.sln
index 1e15328927..96028c08f3 100644
--- a/CSharp/demo-CardsAttachments/TestBot.sln
+++ b/CSharp/demo-CardsAttachments/public-TestBot/TestBot.sln
@@ -1,19 +1,19 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "README", "README", "{A53B6F49-13CC-4391-99BA-70BA466C744E}"
 	ProjectSection(SolutionItems) = preProject
-		README.md = README.md
+		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestBot", "public-TestBot\TestBot.csproj", "{A8BA1066-5695-4D71-ABB4-65E5A5E0C3D4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestBot", "TestBot.csproj", "{A8BA1066-5695-4D71-ABB4-65E5A5E0C3D4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CFDD8A1D-23A7-4C61-9C10-E3753436D3C4} = {CFDD8A1D-23A7-4C61-9C10-E3753436D3C4}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceTool", "SourceTool\SourceTool.csproj", "{CFDD8A1D-23A7-4C61-9C10-E3753436D3C4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceTool", "..\SourceTool\SourceTool.csproj", "{CFDD8A1D-23A7-4C61-9C10-E3753436D3C4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/CSharp/demo-RollerSkill/README.md b/CSharp/demo-RollerSkill/README.md
index 96c5de385d..d453a05aa3 100644
--- a/CSharp/demo-RollerSkill/README.md
+++ b/CSharp/demo-RollerSkill/README.md
@@ -2,6 +2,11 @@
 
 A sample bot optimized for speech-enabled channels such as Cortana.
 
+[![Deploy to Azure][Deploy Button]][Deploy CSharp/ContosoFlowers]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy CSharp/ContosoFlowers]: https://azuredeploy.net
+
 ### Prerequisites
 
 The minimum prerequisites to run this sample are:
diff --git a/CSharp/demo-RollerSkill/RollerSkillBot.csproj b/CSharp/demo-RollerSkill/RollerSkillBot.csproj
index 6a4d938dde..2ea3a256a3 100644
--- a/CSharp/demo-RollerSkill/RollerSkillBot.csproj
+++ b/CSharp/demo-RollerSkill/RollerSkillBot.csproj
@@ -49,13 +49,13 @@
       <HintPath>packages\Chronic.Signed.0.3.2\lib\net40\Chronic.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bot.Builder, Version=3.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bot.Builder.3.8.0.0\lib\net46\Microsoft.Bot.Builder.dll</HintPath>
+      <HintPath>packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bot.Builder.Autofac, Version=3.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bot.Builder.3.8.0.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll</HintPath>
+      <HintPath>packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Builder.Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bot.Connector, Version=3.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bot.Builder.3.8.0.0\lib\net46\Microsoft.Bot.Connector.dll</HintPath>
+      <HintPath>packages\Microsoft.Bot.Builder.3.8.0\lib\net46\Microsoft.Bot.Connector.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.IdentityModel.Protocol.Extensions, Version=1.0.40306.1554, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/CSharp/demo-RollerSkill/azuredeploy.json b/CSharp/demo-RollerSkill/azuredeploy.json
new file mode 100644
index 0000000000..55d2ea02cd
--- /dev/null
+++ b/CSharp/demo-RollerSkill/azuredeploy.json
@@ -0,0 +1,121 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "CSharp/demo-RollerSkill"
+    },
+    "MicrosoftAppId": {
+      "type": "string"
+    },
+    "MicrosoftAppPassword": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "MicrosoftAppId",
+                "value": "[parameters('MicrosoftAppId')]"
+              },
+              {
+                "name": "MicrosoftAppPassword",
+                "value": "[parameters('MicrosoftAppPassword')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CSharp/sample-KnowledgeBot/.gitignore b/CSharp/sample-KnowledgeBot/.gitignore
deleted file mode 100644
index 79db921b22..0000000000
--- a/CSharp/sample-KnowledgeBot/.gitignore
+++ /dev/null
@@ -1,275 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-*.vcxproj.filters
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-**/Properties/launchSettings.json
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# Cake - Uncomment if you are using it
-# tools/
diff --git a/CSharp/sample-KnowledgeBot/AzureSearchBot/Web.config b/CSharp/sample-KnowledgeBot/AzureSearchBot/Web.config
index 7c424722f2..49d4abf5f6 100644
--- a/CSharp/sample-KnowledgeBot/AzureSearchBot/Web.config
+++ b/CSharp/sample-KnowledgeBot/AzureSearchBot/Web.config
@@ -9,9 +9,9 @@
     <add key="BotId" value="YourBotId" />
     <add key="MicrosoftAppId" value="" />
     <add key="MicrosoftAppPassword" value="" />
-    <add key="SearchName" value="Insert your search name"/>
-    <add key="IndexName" value="Insert your index name"/>
-    <add key="SearchKey" value="Insert your Manage query key"/>
+    <add key="SearchName" value=""/>
+    <add key="IndexName" value=""/>
+    <add key="SearchKey" value=""/>
   </appSettings>
   <!--
     For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
diff --git a/CSharp/sample-KnowledgeBot/readme.md b/CSharp/sample-KnowledgeBot/README.md
similarity index 98%
rename from CSharp/sample-KnowledgeBot/readme.md
rename to CSharp/sample-KnowledgeBot/README.md
index 87ba1c6c2c..7b0b6a2cc7 100644
--- a/CSharp/sample-KnowledgeBot/readme.md
+++ b/CSharp/sample-KnowledgeBot/README.md
@@ -3,6 +3,11 @@ If you are new for developing C# bot, please see [this document](https://docs.mi
 
 In this document, we first describe how the code works. Then we explain how to try this sample.
 
+[![Deploy to Azure][Deploy Button]][Deploy CSharp/KnowledgeBot]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy CSharp/KnowledgeBot]: https://azuredeploy.net
+
 ## How the code works
 All messages get routed into the MessagesController.cs. From here, we replace the dialog with the PromptButtonsDialog dialog.
 
diff --git a/CSharp/sample-KnowledgeBot/azuredeploy.json b/CSharp/sample-KnowledgeBot/azuredeploy.json
new file mode 100644
index 0000000000..27193358d2
--- /dev/null
+++ b/CSharp/sample-KnowledgeBot/azuredeploy.json
@@ -0,0 +1,142 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "CSharp/sample-KnowledgeBot/AzureSearchBot"
+    },
+    "MicrosoftAppId": {
+      "type": "string"
+    },
+    "MicrosoftAppPassword": {
+      "type": "string"
+    },
+    "SearchName": {
+      "type": "string"
+    },
+    "IndexName": {
+      "type": "string"
+    },
+    "SearchKey": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "MicrosoftAppId",
+                "value": "[parameters('MicrosoftAppId')]"
+              },
+              {
+                "name": "MicrosoftAppPassword",
+                "value": "[parameters('MicrosoftAppPassword')]"
+              },
+              {
+                "name": "SearchName",
+                "value": "[parameters('SearchName')]"
+              },
+              {
+                "name": "IndexName",
+                "value": "[parameters('IndexName')]"
+              },
+              {
+                "name": "SearchKey",
+                "value": "[parameters('SearchKey')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CSharp/sample-KnowledgeBot/data/classicalMusicians.json b/CSharp/sample-KnowledgeBot/data/classicalMusicians.json
new file mode 100644
index 0000000000..7b8fc41095
--- /dev/null
+++ b/CSharp/sample-KnowledgeBot/data/classicalMusicians.json
@@ -0,0 +1,116 @@
+[
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/6/6a/Johann_Sebastian_Bach.jpg",
+        "Name": "Johannes Sebastian Bach",
+        "Era": "Classical",
+        "Description": "Johann Christian Bach was a composer of the Classical era, the eleventh surviving child and youngest son of Johann Sebastian Bach."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/3/33/Chopin,_by_Wodzinska.JPG",
+        "Name": "Frederic Chopin",
+        "Era": "Romantic",
+        "Description": "Frédéric François Chopin, born Fryderyk Franciszek Chopin, was a Polish composer and virtuoso pianist of the Romantic era who wrote primarily for the solo piano."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Beethoven.jpg/1280px-Beethoven.jpg",
+        "Name": "Ludwig Van Beethoven",
+        "Era": "Romantic",
+        "Description": "Ludwig van Beethoven was a German composer and pianist. A crucial figure in the transition between the Classical and Romantic eras in Western art music, he remains one of the most famous and influential of all composers."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/1/1e/Wolfgang-amadeus-mozart_1.jpg",
+        "Name": "Wolfgang Amadeus Mozart",
+        "Era": "Classical",
+        "Description": "Wolfgang Amadeus Mozart, baptised as Johannes Chrysostomus Wolfgangus Theophilus Mozart, was a prolific and influential composer of the Classical era. Born in Salzburg, Mozart showed prodigious ability from his earliest childhood."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/f/fa/George_Frideric_Handel_by_Balthasar_Denner.jpg",
+        "Name": "George Frideric Handel",
+        "Era": "Baroque",
+        "Description": "George Frideric Handel was a German, later British baroque composer who spent the bulk of his career in London, becoming well known for his operas, oratorios, anthems, and organ concertos."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/8/8a/Pyotr_Ilyich_Tchaikovsky.jpg",
+        "Name": "Pyotr Ilyich Tchaikovsky",
+        "Era": "Romantic",
+        "Description": "Pyotr Ilyich Tchaikovsky, often anglicized as Peter Ilyich Tchaikovsky, was a Russian composer of the late-Romantic period, some of whose works are among the most popular music in the classical repertoire."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/7/79/Franz_Schubert_cropped.jpg",
+        "Name": "Franz Shubert",
+        "Era": "Romantic",
+        "Description": "Franz Peter Schubert was an Austrian composer. Schubert died before his 32nd birthday, but was extremely prolific during his lifetime."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/1/15/JohannesBrahms.jpg",
+        "Name": "Johannes Brahms",
+        "Era": "Romantic",
+        "Description": "Johannes Brahms was a German composer and pianist. Born in Hamburg into a Lutheran family, Brahms spent much of his professional life in Vienna, Austria."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/9/9d/RichardWagner.jpg",
+        "Name": "Richard Wagner",
+        "Era": "Romantic",
+        "Description": "Wilhelm Richard Wagner was a German composer, theatre director, polemicist, and conductor who is primarily known for his operas. Unlike most opera composers, Wagner wrote both the libretto and the music for each of his stage works."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/thumb/0/05/Joseph_Haydn.jpg/475px-Joseph_Haydn.jpg",
+        "Name": "Joseph Haydn",
+        "Era": "Classical",
+        "Description": "Joseph Haydn was a prolific Austrian composer of the Classical period. He was instrumental in the development of chamber music such as the piano trio and his contributions to musical form have earned him the epithets \"Father of the Symphony\" and \"Father of the String Quartet\"."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/f/f9/Claude_Debussy_ca_1908,_foto_av_F%C3%A9lix_Nadar.jpg",
+        "Name": "Claude Debussy",
+        "Era": "Impressionist",
+        "Description": "Claude-Achille Debussy was a French composer. He and Maurice Ravel were the most prominent figures associated with Impressionist music, though Debussy disliked the term when applied to his compositions."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/3/3a/Franz_Liszt_by_Nadar,_March_1886.png",
+        "Name": "Frans Liszt",
+        "Era": "Romantic",
+        "Description": "Franz Liszt was a prolific 19th-century Hungarian composer, virtuoso pianist, conductor, music teacher, arranger, and Franciscan tertiary."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/b/b7/Gustav-Mahler-Kohut.jpg",
+        "Name": "Gustav Mahler",
+        "Era": "Romantic",
+        "Description": "Gustav Mahler was an Austrian late-Romantic composer, and one of the leading conductors of his generation. As a composer he acted as a bridge between the 19th century Austro-German tradition and the modernism of the early 20th century."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/c/cc/Igor_Stravinsky_Essays.jpg",
+        "Name": "Igor Stravinsky",
+        "Era": "Modernist",
+        "Description": "Igor Fyodorovich Stravinsky was a Russian composer, pianist, and conductor. He is widely considered one of the most important and influential composers of the 20th century. Stravinsky's compositional career was notable for its stylistic diversity."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/thumb/7/72/Felix_Mendelssohn-Bartholdy_%28AMZ_1837%29.png/1070px-Felix_Mendelssohn-Bartholdy_%28AMZ_1837%29.png",
+        "Name": "Felix Mendelssohn",
+        "Era": "Romantic",
+        "Description": "Jakob Ludwig Felix Mendelssohn Bartholdy, born and widely known as Felix Mendelssohn, was a German composer, pianist, organist and conductor of the early Romantic period."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/9/98/Antonio_Vivaldi_portrait.jpg",
+        "Name": "Antonio Vivaldi",
+        "Era": "Baroque",
+        "Description": "Antonio Lucio Vivaldi was an Italian Baroque composer, virtuoso violinist, teacher and cleric. Born in Venice, he is recognized as one of the greatest Baroque composers, and his influence during his lifetime was widespread across Europe."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/b/be/Sergei_Rachmaninoff_cph.3a40575.jpg",
+        "Name": "Sergei Rachmaninoff",
+        "Era": "Romantic",
+        "Description": "Sergei Vasilievich Rachmaninoff was a Russian pianist, composer, and conductor of the late-Romantic period, some of whose works are among the most popular in the classical repertoire. He is regarded as one of the major composers of the 20th century."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/3/3e/Portrait_of_Robert_Schumann.jpg",
+        "Name": "Robert Schumann",
+        "Era": "Romantic",
+        "Description": "Robert Schumann was a German composer and influential music critic. He is widely regarded as one of the greatest composers of the Romantic era. Schumann left the study of law, intending to pursue a career as a virtuoso pianist."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/7/78/Maurice_Ravel_1925.jpg",
+        "Name": "Maurice Ravel",
+        "Era": "Impressionist",
+        "Description": "Joseph Maurice Ravel was a French composer, pianist and conductor. He is often associated with impressionism along with his elder contemporary Claude Debussy, although both composers rejected the term."
+    }
+]
\ No newline at end of file
diff --git a/CSharp/sample-payments/.gitignore b/CSharp/sample-payments/.gitignore
deleted file mode 100644
index fba4c25f31..0000000000
--- a/CSharp/sample-payments/.gitignore
+++ /dev/null
@@ -1,239 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-build/
-bld/
-[Bb]in/
-[Oo]bj/
-ecf/
-rcf/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-*.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-## TODO: Comment the next line if you want to checkin your
-## web deploy settings but do note that will include unencrypted
-## passwords
-#*.pubxml
-
-## ignore imporeted publish xml files
-*intercom-botdirectory-scratch\ -\ FTP.pubxml
-*intercom-botdirectory-scratch\ -\ Web\ Deploy.pubxml
-
-*.publishproj
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-
-# Windows Azure Build Output
-csx/
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# LightSwitch generated files
-GeneratedArtifacts/
-_Pvt_Extensions/
-ModelManifest.xml
-/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
-/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.xml
-/PublishScripts/Scripts/Deploy-AzureResourceGroup-5.ps1
-/PublishScripts
-
-
-
-
-
-
-
-
-
-# User-specific files
-Documentation/Doxygen_warnings.txt
-
-# Build results
-Documentation/docs/
-
-# Azure publish profiles
-*.pubxml
-PublishProfiles/
diff --git a/CSharp/sample-payments/README.md b/CSharp/sample-payments/README.md
index 23aee98f4e..e0aab95655 100644
--- a/CSharp/sample-payments/README.md
+++ b/CSharp/sample-payments/README.md
@@ -2,6 +2,11 @@
 
 A sample bot showing how to integrate with Microsoft Seller Center for payment processing.
 
+[![Deploy to Azure][Deploy Button]][Deploy CSharp/Payments]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy CSharp/Payments]: https://azuredeploy.net
+
 ### Prerequisites
 
 The minimum prerequisites to run this sample are:
diff --git a/CSharp/sample-payments/azuredeploy.json b/CSharp/sample-payments/azuredeploy.json
new file mode 100644
index 0000000000..9a7b7be130
--- /dev/null
+++ b/CSharp/sample-payments/azuredeploy.json
@@ -0,0 +1,143 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "CSharp/sample-payments/PaymentsBot"
+    },
+    "MicrosoftAppId": {
+      "type": "string"
+    },
+    "MicrosoftAppPassword": {
+      "type": "string"
+    },
+    "LiveMode": {
+      "type": "bool",
+      "defaultValue": false
+    },
+    "MerchantId": {
+      "type": "string"
+    },
+    "StripeApiKey": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "MicrosoftAppId",
+                "value": "[parameters('MicrosoftAppId')]"
+              },
+              {
+                "name": "MicrosoftAppPassword",
+                "value": "[parameters('MicrosoftAppPassword')]"
+              },
+              {
+                "name": "LiveMode",
+                "value": "[parameters('LiveMode')]"
+              },
+              {
+                "name": "MerchantId",
+                "value": "[parameters('MerchantId')]"
+              },
+              {
+                "name": "StripeApiKey",
+                "value": "[parameters('StripeApiKey')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CSharp/skype-CallingBot/README.md b/CSharp/skype-CallingBot/README.md
index e0daeeb369..0fe36f6048 100644
--- a/CSharp/skype-CallingBot/README.md
+++ b/CSharp/skype-CallingBot/README.md
@@ -2,6 +2,11 @@
 
 A sample bot showing how to use the Skype Bot Plaform for Calling API for receiving and handling Skype voice calls.
 
+[![Deploy to Azure][Deploy Button]][Deploy CSharp/SkypeCallingBot]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy CSharp/SkypeCallingBot]: https://azuredeploy.net
+
 ### Prerequisites
 
 The minimum prerequisites to run this sample are:
diff --git a/CSharp/skype-CallingBot/azuredeploy.json b/CSharp/skype-CallingBot/azuredeploy.json
new file mode 100644
index 0000000000..24ebe5373f
--- /dev/null
+++ b/CSharp/skype-CallingBot/azuredeploy.json
@@ -0,0 +1,135 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "CSharp/skype-CallingBot"
+    },
+    "MicrosoftAppId": {
+      "type": "string"
+    },
+    "MicrosoftAppPassword": {
+      "type": "string"
+    },
+    "Microsoft.Bot.Builder.Calling.CallbackUrl": {
+      "type": "string"
+    },
+    "MicrosoftSpeechApiKey": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "MicrosoftAppId",
+                "value": "[parameters('MicrosoftAppId')]"
+              },
+              {
+                "name": "MicrosoftAppPassword",
+                "value": "[parameters('MicrosoftAppPassword')]"
+              },
+              {
+                "name": "Microsoft.Bot.Builder.Calling.CallbackUrl",
+                "value": "[parameters('Microsoft.Bot.Builder.Calling.CallbackUrl')]"
+              },
+              {
+                "name": "MicrosoftSpeechApiKey",
+                "value": "[parameters('MicrosoftSpeechApiKey')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Node/blog-customChannelData/.env b/Node/blog-customChannelData/.env
index b0e3340b17..d5f29e6150 100644
--- a/Node/blog-customChannelData/.env
+++ b/Node/blog-customChannelData/.env
@@ -1,3 +1,4 @@
-# Bot Framework Variables
-MSFT_APP_ID=
-MSFT_APP_PW=
+# Bot Framework Credentials
+
+MICROSOFT_APP_ID=
+MICROSOFT_APP_PASSWORD=
diff --git a/Node/blog-customChannelData/node_custom_channel.js b/Node/blog-customChannelData/app.js
similarity index 88%
rename from Node/blog-customChannelData/node_custom_channel.js
rename to Node/blog-customChannelData/app.js
index 9202aa6911..bd8aa3770a 100644
--- a/Node/blog-customChannelData/node_custom_channel.js
+++ b/Node/blog-customChannelData/app.js
@@ -7,21 +7,17 @@ var restify = require("restify");
 var botbuilder = require("botbuilder");
 var request = require("request-promise");
 
-//load environment variables here
-const MSFT_APP_ID = process.env.MSFT_APP_ID;
-const MSFT_APP_PW = process.env.MSFT_APP_PW;
-
 //create an express server
 var app = express();
-var port = process.env.PORT || 3978;
+var port = process.env.port || process.env.PORT || 3978;
 app.listen(port, function () {
-    console.log("Express app listening on port: " + port);
+    console.log('%s listening in port %s', app.name, port);
 });
 
 //create a chat connector for the bot
 var connector = new botbuilder.ChatConnector({
-    appId: MSFT_APP_ID,
-    appPassword: MSFT_APP_PW
+    appId: process.env.MICROSOFT_APP_ID,
+    appPassword: process.env.MICROSOFT_APP_PASSWORD
 });
 
 //load the botbuilder classes and build a unversal bot using the chat connector
@@ -37,7 +33,7 @@ bot.dialog("/", function (session) {
     console.log("Bot Received Message at '/' dialogue endpoint: ");
 
     //detect Facebook Messenger message here
-    if (session.message.address.channelId == "facebook") {
+    if (session.message.address.channelId === "facebook") {
         session.send("Facebook message recognized!");
         session.beginDialog("/send_share_button");
     } else session.send("Channel other than Facebook recognized.");
diff --git a/Node/blog-customChannelData/azuredeploy.json b/Node/blog-customChannelData/azuredeploy.json
new file mode 100644
index 0000000000..c115564c34
--- /dev/null
+++ b/Node/blog-customChannelData/azuredeploy.json
@@ -0,0 +1,129 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "Node/blog-customChannelData"
+    },
+    "WEBSITE_NODE_DEFAULT_VERSION": {
+      "type": "string",
+      "defaultValue": "6.9.5"
+    },
+    "MICROSOFT_APP_ID": {
+      "type": "string"
+    },
+    "MICROSOFT_APP_PASSWORD": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "WEBSITE_NODE_DEFAULT_VERSION",
+                "value": "[parameters('WEBSITE_NODE_DEFAULT_VERSION')]"
+              },
+              {
+                "name": "MICROSOFT_APP_ID",
+                "value": "[parameters('MICROSOFT_APP_ID')]"
+              },
+              {
+                "name": "MICROSOFT_APP_PASSWORD",
+                "value": "[parameters('MICROSOFT_APP_PASSWORD')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Node/core-ProgressDIalog/.env b/Node/capability-SimpleTaskAutomation/.env
similarity index 100%
rename from Node/core-ProgressDIalog/.env
rename to Node/capability-SimpleTaskAutomation/.env
diff --git a/Node/capability-SimpleTaskAutomation/README.md b/Node/capability-SimpleTaskAutomation/README.md
index 2cb749ace8..c34dcdf0f6 100644
--- a/Node/capability-SimpleTaskAutomation/README.md
+++ b/Node/capability-SimpleTaskAutomation/README.md
@@ -2,6 +2,11 @@
 
 A sample bot showing how to do simple task automation scenarios.
 
+[![Deploy to Azure][Deploy Button]][Deploy Node/SimpleTaskAutomation]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy Node/SimpleTaskAutomation]: https://azuredeploy.net
+
 ### Prerequisites
 
 The minimum prerequisites to run this sample are:
diff --git a/Node/capability-SimpleTaskAutomation/azuredeploy.json b/Node/capability-SimpleTaskAutomation/azuredeploy.json
new file mode 100644
index 0000000000..4881070c72
--- /dev/null
+++ b/Node/capability-SimpleTaskAutomation/azuredeploy.json
@@ -0,0 +1,129 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "Node/capability-SimpleTaskAutomation"
+    },
+    "WEBSITE_NODE_DEFAULT_VERSION": {
+      "type": "string",
+      "defaultValue": "6.9.5"
+    },
+    "MICROSOFT_APP_ID": {
+      "type": "string"
+    },
+    "MICROSOFT_APP_PASSWORD": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "WEBSITE_NODE_DEFAULT_VERSION",
+                "value": "[parameters('WEBSITE_NODE_DEFAULT_VERSION')]"
+              },
+              {
+                "name": "MICROSOFT_APP_ID",
+                "value": "[parameters('MICROSOFT_APP_ID')]"
+              },
+              {
+                "name": "MICROSOFT_APP_PASSWORD",
+                "value": "[parameters('MICROSOFT_APP_PASSWORD')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Node/capability-middlewareLogging/.env b/Node/capability-middlewareLogging/.env
new file mode 100644
index 0000000000..d5f29e6150
--- /dev/null
+++ b/Node/capability-middlewareLogging/.env
@@ -0,0 +1,4 @@
+# Bot Framework Credentials
+
+MICROSOFT_APP_ID=
+MICROSOFT_APP_PASSWORD=
diff --git a/Node/capability-middlewareLogging/README.md b/Node/capability-middlewareLogging/README.md
index a6b8928cd3..2e4b3e37a5 100644
--- a/Node/capability-middlewareLogging/README.md
+++ b/Node/capability-middlewareLogging/README.md
@@ -2,6 +2,11 @@
 
 This is a basic bot that logs incoming and outgoing messages to the console. If you are looking to add logging to your bot, replace `console.log` with a function that logs messages to your location of choice. There is also a regex match for the word ‘secret’ on incoming messages. This model is how you can build middleware that never causes the bot code to execute.
 
+[![Deploy to Azure][Deploy Button]][Deploy Node/MiddlewareLogging]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy Node/MiddlewareLogging]: https://azuredeploy.net
+
 ### Adding Middleware Using the BotBuilder Node SDK 
 In the Node SDK, middleware is installed using [UniversalBot.use](https://docs.botframework.com/en-us/node/builder/chat-reference/classes/_botbuilder_d_.universalbot.html#use). There are three possible hooks: receive, botbuilder and send. The team that build this SDK created the receive hook to be used for middleware that works across multiple toolkits (i.e., BotBuilder & BotKit). If this is your specific use case, be aware that if you include middleware in botbuilder, receive will execute first, followed by botbuilder. Because this example (and most bots) do not fit this category, we will be using the botbuilder hook for incoming messages.
 
diff --git a/Node/capability-middlewareLogging/app.js b/Node/capability-middlewareLogging/app.js
index f03a138c3b..903d81bd17 100644
--- a/Node/capability-middlewareLogging/app.js
+++ b/Node/capability-middlewareLogging/app.js
@@ -1,3 +1,6 @@
+// This loads the environment variables from the .env file
+require('dotenv-extended').load();
+
 const builder = require('botbuilder');
 const restify = require('restify');
 
diff --git a/Node/capability-middlewareLogging/azuredeploy.json b/Node/capability-middlewareLogging/azuredeploy.json
new file mode 100644
index 0000000000..530e772a7c
--- /dev/null
+++ b/Node/capability-middlewareLogging/azuredeploy.json
@@ -0,0 +1,129 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "Node/capability-middlewareLogging"
+    },
+    "WEBSITE_NODE_DEFAULT_VERSION": {
+      "type": "string",
+      "defaultValue": "6.9.5"
+    },
+    "MICROSOFT_APP_ID": {
+      "type": "string"
+    },
+    "MICROSOFT_APP_PASSWORD": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "WEBSITE_NODE_DEFAULT_VERSION",
+                "value": "[parameters('WEBSITE_NODE_DEFAULT_VERSION')]"
+              },
+              {
+                "name": "MICROSOFT_APP_ID",
+                "value": "[parameters('MICROSOFT_APP_ID')]"
+              },
+              {
+                "name": "MICROSOFT_APP_PASSWORD",
+                "value": "[parameters('MICROSOFT_APP_PASSWORD')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Node/capability-middlewareLogging/package.json b/Node/capability-middlewareLogging/package.json
index d827d91e3e..6581c1700c 100644
--- a/Node/capability-middlewareLogging/package.json
+++ b/Node/capability-middlewareLogging/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "botbuilder": "^3.8.2",
+    "dotenv-extended": "^2.0.0",
     "restify": "^4.3.0"
   }
 }
diff --git a/Node/core-ProgressDialog/.env b/Node/core-ProgressDialog/.env
new file mode 100644
index 0000000000..d5f29e6150
--- /dev/null
+++ b/Node/core-ProgressDialog/.env
@@ -0,0 +1,4 @@
+# Bot Framework Credentials
+
+MICROSOFT_APP_ID=
+MICROSOFT_APP_PASSWORD=
diff --git a/Node/core-ProgressDIalog/README.md b/Node/core-ProgressDialog/README.md
similarity index 100%
rename from Node/core-ProgressDIalog/README.md
rename to Node/core-ProgressDialog/README.md
diff --git a/Node/core-ProgressDIalog/app.js b/Node/core-ProgressDialog/app.js
similarity index 100%
rename from Node/core-ProgressDIalog/app.js
rename to Node/core-ProgressDialog/app.js
diff --git a/Node/core-ProgressDIalog/azuredeploy.json b/Node/core-ProgressDialog/azuredeploy.json
similarity index 100%
rename from Node/core-ProgressDIalog/azuredeploy.json
rename to Node/core-ProgressDialog/azuredeploy.json
diff --git a/Node/core-ProgressDIalog/package.json b/Node/core-ProgressDialog/package.json
similarity index 100%
rename from Node/core-ProgressDIalog/package.json
rename to Node/core-ProgressDialog/package.json
diff --git a/Node/core-basicMultiDialog/.env b/Node/core-basicMultiDialog/.env
new file mode 100644
index 0000000000..186fd67d89
--- /dev/null
+++ b/Node/core-basicMultiDialog/.env
@@ -0,0 +1,3 @@
+# Bot Framework Variables
+MICROSOFT_APP_ID=
+MICROSOFT_APP_PASSWORD=
diff --git a/Node/core-basicMultiDialog/.gitignore b/Node/core-basicMultiDialog/.gitignore
deleted file mode 100644
index 1dcef2d9f2..0000000000
--- a/Node/core-basicMultiDialog/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-.env
\ No newline at end of file
diff --git a/Node/core-basicMultiDialog/README.md b/Node/core-basicMultiDialog/README.md
index 3b550639ba..216bbb729a 100644
--- a/Node/core-basicMultiDialog/README.md
+++ b/Node/core-basicMultiDialog/README.md
@@ -2,6 +2,11 @@
 
 A conversation inside of a bot can contain one or more dialogs. A dialog is designed to be a self-contained set of interactions to collect information from a user, or perform an action on her behalf. The bot maintains a stack of dialogs, meaning that as each one completes, it's popped off the stack, and control returns to the one prior. You can add dialogs to the stack by calling `session.beginDialog` or `session.replaceDialog`, and ended by using `session.endDialog` or `session.endDialogWithResult`.
 
+[![Deploy to Azure][Deploy Button]][Deploy Node/BasicMultiDialog]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy Node/BasicMultiDialog]: https://azuredeploy.net
+
 ## Why create dialogs?
 
 Dialogs allow you to make your bot modular. Having multiple dialogs allows you to create smaller black boxes that can perform individual actions, much in the same way you'd create methods. In addition, because of the waterfall nature of bot logic, having dialogs allows you to perform validation, and restart an operation if needed. Finally, having multiple dialogs affords you the opportunity for reuse, which, of course, is the goal of all software development.
diff --git a/Node/core-basicMultiDialog/app.js b/Node/core-basicMultiDialog/app.js
index 427b446e21..db90797cb2 100644
--- a/Node/core-basicMultiDialog/app.js
+++ b/Node/core-basicMultiDialog/app.js
@@ -1,9 +1,9 @@
+require('dotenv-extended').load();
 const restify = require('restify');
-require('dotenv').config();
 const bot = require('./bot.js');
 
 const server = restify.createServer();
 server.post('/api/messages', bot.connector('*').listen());
-server.listen(process.env.PORT, () => {
+server.listen(process.env.PORT || 3978, () => {
     console.log(`${server.name} listening to ${server.url}`);
-});
\ No newline at end of file
+});
diff --git a/Node/core-basicMultiDialog/azuredeploy.json b/Node/core-basicMultiDialog/azuredeploy.json
new file mode 100644
index 0000000000..ee401f7423
--- /dev/null
+++ b/Node/core-basicMultiDialog/azuredeploy.json
@@ -0,0 +1,129 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "Node/core-basicMultiDialog"
+    },
+    "WEBSITE_NODE_DEFAULT_VERSION": {
+      "type": "string",
+      "defaultValue": "6.9.5"
+    },
+    "MICROSOFT_APP_ID": {
+      "type": "string"
+    },
+    "MICROSOFT_APP_PASSWORD": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "WEBSITE_NODE_DEFAULT_VERSION",
+                "value": "[parameters('WEBSITE_NODE_DEFAULT_VERSION')]"
+              },
+              {
+                "name": "MICROSOFT_APP_ID",
+                "value": "[parameters('MICROSOFT_APP_ID')]"
+              },
+              {
+                "name": "MICROSOFT_APP_PASSWORD",
+                "value": "[parameters('MICROSOFT_APP_PASSWORD')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Node/core-basicMultiDialog/package.json b/Node/core-basicMultiDialog/package.json
index 1a78b8e451..403c89916c 100644
--- a/Node/core-basicMultiDialog/package.json
+++ b/Node/core-basicMultiDialog/package.json
@@ -1,12 +1,9 @@
 {
-    "name": "botbuilder-sample-basicmultidialog",
+    "name": "core-basic-multidialog",
+    "version": "1.0.0",
     "dependencies": {
         "botbuilder": "^3.8.2",
-        "dotenv": "^2.0.0",
+        "dotenv-extended": "^2.0.0",
         "restify": "^4.3.0"
-    },
-    "devDependencies": {
-        "@types/node": "^6.0.52",
-        "@types/restify": "^2.0.35"
     }
 }
\ No newline at end of file
diff --git a/Node/core-globalMessageHandlers/.env b/Node/core-globalMessageHandlers/.env
new file mode 100644
index 0000000000..186fd67d89
--- /dev/null
+++ b/Node/core-globalMessageHandlers/.env
@@ -0,0 +1,3 @@
+# Bot Framework Variables
+MICROSOFT_APP_ID=
+MICROSOFT_APP_PASSWORD=
diff --git a/Node/core-globalMessageHandlers/.gitignore b/Node/core-globalMessageHandlers/.gitignore
deleted file mode 100644
index 1dcef2d9f2..0000000000
--- a/Node/core-globalMessageHandlers/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-.env
\ No newline at end of file
diff --git a/Node/core-globalMessageHandlers/README.md b/Node/core-globalMessageHandlers/README.md
index 79e5b239a9..710cdac077 100644
--- a/Node/core-globalMessageHandlers/README.md
+++ b/Node/core-globalMessageHandlers/README.md
@@ -2,6 +2,11 @@
 
 Communication with a user via a bot built with [Microsoft Bot Framework](https://dev.botframework.com) is managed via conversations, dialogs, waterfalls, and steps. As the user interacts with the bot, the bot will start, stop, and switch between various dialogs in response to the messages the user sends. Knowing how to manage dialogs in Bot Framework is one of the keys to successfully designing and creating a bot.
 
+[![Deploy to Azure][Deploy Button]][Deploy Node/GlobalMessageHandlers]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy Node/GlobalMessageHandlers]: https://azuredeploy.net
+
 ## Dialogs and conversations, defined
 
 At its most basic level, a **dialog** is a reusable module, a collection of methods, which performs an operation, such as completing an action on the user's behalf, or collecting information from the user. By creating dialogs you can add reuse to your bot, enable better communication with the user, and simplify what would otherwise be complex logic. Dialogs also contain state specific to the dialog in **dialogData**.
diff --git a/Node/core-globalMessageHandlers/app.js b/Node/core-globalMessageHandlers/app.js
index 427b446e21..db90797cb2 100644
--- a/Node/core-globalMessageHandlers/app.js
+++ b/Node/core-globalMessageHandlers/app.js
@@ -1,9 +1,9 @@
+require('dotenv-extended').load();
 const restify = require('restify');
-require('dotenv').config();
 const bot = require('./bot.js');
 
 const server = restify.createServer();
 server.post('/api/messages', bot.connector('*').listen());
-server.listen(process.env.PORT, () => {
+server.listen(process.env.PORT || 3978, () => {
     console.log(`${server.name} listening to ${server.url}`);
-});
\ No newline at end of file
+});
diff --git a/Node/core-globalMessageHandlers/azuredeploy.json b/Node/core-globalMessageHandlers/azuredeploy.json
new file mode 100644
index 0000000000..ad0f0d7208
--- /dev/null
+++ b/Node/core-globalMessageHandlers/azuredeploy.json
@@ -0,0 +1,129 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "Node/core-globalMessageHandlers"
+    },
+    "WEBSITE_NODE_DEFAULT_VERSION": {
+      "type": "string",
+      "defaultValue": "6.9.5"
+    },
+    "MICROSOFT_APP_ID": {
+      "type": "string"
+    },
+    "MICROSOFT_APP_PASSWORD": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "WEBSITE_NODE_DEFAULT_VERSION",
+                "value": "[parameters('WEBSITE_NODE_DEFAULT_VERSION')]"
+              },
+              {
+                "name": "MICROSOFT_APP_ID",
+                "value": "[parameters('MICROSOFT_APP_ID')]"
+              },
+              {
+                "name": "MICROSOFT_APP_PASSWORD",
+                "value": "[parameters('MICROSOFT_APP_PASSWORD')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Node/core-globalMessageHandlers/package.json b/Node/core-globalMessageHandlers/package.json
index e3dfff0555..d1ea4c1113 100644
--- a/Node/core-globalMessageHandlers/package.json
+++ b/Node/core-globalMessageHandlers/package.json
@@ -1,12 +1,9 @@
 {
-  "name": "core-basicmultidialog",
+  "name": "core-globalmessagehandlers",
+  "version": "1.0.0",
   "dependencies": {
     "botbuilder": "^3.8.4",
-    "dotenv": "^2.0.0",
+    "dotenv-extended": "^2.0.0",
     "restify": "^4.3.0"
-  },
-  "devDependencies": {
-    "@types/node": "^6.0.52",
-    "@types/restify": "^2.0.35"
   }
 }
diff --git a/Node/sample-knowledgeBot/.env b/Node/sample-knowledgeBot/.env
new file mode 100644
index 0000000000..5978efe48a
--- /dev/null
+++ b/Node/sample-knowledgeBot/.env
@@ -0,0 +1,8 @@
+# Bot Framework Variables
+MICROSOFT_APP_ID=
+MICROSOFT_APP_PASSWORD=
+
+# Azure Search Variables
+AZURE_SEARCH_NAME=
+AZURE_SEARCH_KEY=
+INDEX_NAME=
\ No newline at end of file
diff --git a/Node/sample-knowledgeBot/.gitignore b/Node/sample-knowledgeBot/.gitignore
deleted file mode 100644
index 8a98547545..0000000000
--- a/Node/sample-knowledgeBot/.gitignore
+++ /dev/null
@@ -1,45 +0,0 @@
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-node_modules
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
-
-#Azure
-iisnode.yml
-
-.vscode
\ No newline at end of file
diff --git a/Node/sample-knowledgeBot/readme.md b/Node/sample-knowledgeBot/README.md
similarity index 98%
rename from Node/sample-knowledgeBot/readme.md
rename to Node/sample-knowledgeBot/README.md
index 74b5591a68..0e400c0088 100644
--- a/Node/sample-knowledgeBot/readme.md
+++ b/Node/sample-knowledgeBot/README.md
@@ -2,6 +2,11 @@
 
 In this demo I'll demonstrate how to use Azure Document DB, Azure Search and the Microsoft Bot Framework to build a bot that searches and filters over an underlying dataset.
 
+[![Deploy to Azure][Deploy Button]][Deploy Node/KnowledgeBot]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy Node/KnowledgeBot]: https://azuredeploy.net
+
 ## Background
 More and more frequently we're seeing the value in bots that can reason over underlying data. These bots can help provide users with information about events, products, telemetry etc. Where it's certainly possible to connect a bot directly to a database and perform queries against it, we've found that using a search engine over our data is particularly helpful for two big things: 
 
@@ -134,7 +139,7 @@ sake of simplicity I'm going to use the Document DB Data Migration Tool (documen
         }
     ]);
     ```
-    In the promptButtons dialog we use the Prompts.choice method to prompt the user with our choices (in this case Musician Explorer and Musician Search) defined in the `choices` array. Once the user answers, we move into the next function which uses a switch statement to decide which dialog to route us to. Note that the musicianExplorer and musicianSearch dialogs each have their own .js file in the 'dialogs' folder and were included at the start of app.js.
+    In the promptButtons dialog we use the Prompts.choice method to prompt the user with our choices (in this case Musician Explorer and Musician Search) defined in the `choices` array. Once the user answers, we move into the next function which uses a switch statement to decide which dialog to route us to. Note that the musicianExplorer and musicianSearch dialogs each have their own .js file in the 'dialogs' folder and were included at the start of [app.js](./app.js).
 
     ```javascript
     bot.dialog('/promptButtons', [
diff --git a/Node/sample-knowledgeBot/app.js b/Node/sample-knowledgeBot/app.js
index f2b4e6cac7..57e2570edd 100644
--- a/Node/sample-knowledgeBot/app.js
+++ b/Node/sample-knowledgeBot/app.js
@@ -1,4 +1,6 @@
- require('./config.js')();
+require('dotenv-extended').load();
+
+require('./config.js')();
 require('./connectorSetup.js')();
 require('./searchHelpers.js')();
 require('./dialogs/results.js')(); 
diff --git a/Node/sample-knowledgeBot/azuredeploy.json b/Node/sample-knowledgeBot/azuredeploy.json
new file mode 100644
index 0000000000..76120defb1
--- /dev/null
+++ b/Node/sample-knowledgeBot/azuredeploy.json
@@ -0,0 +1,150 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "Node/sample-knowledgeBot"
+    },
+    "WEBSITE_NODE_DEFAULT_VERSION": {
+      "type": "string",
+      "defaultValue": "6.9.5"
+    },
+    "MICROSOFT_APP_ID": {
+      "type": "string"
+    },
+    "MICROSOFT_APP_PASSWORD": {
+      "type": "string"
+    },
+    "AZURE_SEARCH_NAME": {
+      "type": "string"
+    },
+    "AZURE_SEARCH_KEY": {
+      "type": "string"
+    },
+    "INDEX_NAME": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "WEBSITE_NODE_DEFAULT_VERSION",
+                "value": "[parameters('WEBSITE_NODE_DEFAULT_VERSION')]"
+              },
+              {
+                "name": "MICROSOFT_APP_ID",
+                "value": "[parameters('MICROSOFT_APP_ID')]"
+              },
+              {
+                "name": "MICROSOFT_APP_PASSWORD",
+                "value": "[parameters('MICROSOFT_APP_PASSWORD')]"
+              },
+              {
+                "name": "AZURE_SEARCH_NAME",
+                "value": "[parameters('AZURE_SEARCH_NAME')]"
+              },
+              {
+                "name": "AZURE_SEARCH_KEY",
+                "value": "[parameters('AZURE_SEARCH_KEY')]"
+              },
+              {
+                "name": "INDEX_NAME",
+                "value": "[parameters('INDEX_NAME')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Node/sample-knowledgeBot/data/classicalMusicians.json b/Node/sample-knowledgeBot/data/classicalMusicians.json
new file mode 100644
index 0000000000..7b8fc41095
--- /dev/null
+++ b/Node/sample-knowledgeBot/data/classicalMusicians.json
@@ -0,0 +1,116 @@
+[
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/6/6a/Johann_Sebastian_Bach.jpg",
+        "Name": "Johannes Sebastian Bach",
+        "Era": "Classical",
+        "Description": "Johann Christian Bach was a composer of the Classical era, the eleventh surviving child and youngest son of Johann Sebastian Bach."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/3/33/Chopin,_by_Wodzinska.JPG",
+        "Name": "Frederic Chopin",
+        "Era": "Romantic",
+        "Description": "Frédéric François Chopin, born Fryderyk Franciszek Chopin, was a Polish composer and virtuoso pianist of the Romantic era who wrote primarily for the solo piano."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Beethoven.jpg/1280px-Beethoven.jpg",
+        "Name": "Ludwig Van Beethoven",
+        "Era": "Romantic",
+        "Description": "Ludwig van Beethoven was a German composer and pianist. A crucial figure in the transition between the Classical and Romantic eras in Western art music, he remains one of the most famous and influential of all composers."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/1/1e/Wolfgang-amadeus-mozart_1.jpg",
+        "Name": "Wolfgang Amadeus Mozart",
+        "Era": "Classical",
+        "Description": "Wolfgang Amadeus Mozart, baptised as Johannes Chrysostomus Wolfgangus Theophilus Mozart, was a prolific and influential composer of the Classical era. Born in Salzburg, Mozart showed prodigious ability from his earliest childhood."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/f/fa/George_Frideric_Handel_by_Balthasar_Denner.jpg",
+        "Name": "George Frideric Handel",
+        "Era": "Baroque",
+        "Description": "George Frideric Handel was a German, later British baroque composer who spent the bulk of his career in London, becoming well known for his operas, oratorios, anthems, and organ concertos."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/8/8a/Pyotr_Ilyich_Tchaikovsky.jpg",
+        "Name": "Pyotr Ilyich Tchaikovsky",
+        "Era": "Romantic",
+        "Description": "Pyotr Ilyich Tchaikovsky, often anglicized as Peter Ilyich Tchaikovsky, was a Russian composer of the late-Romantic period, some of whose works are among the most popular music in the classical repertoire."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/7/79/Franz_Schubert_cropped.jpg",
+        "Name": "Franz Shubert",
+        "Era": "Romantic",
+        "Description": "Franz Peter Schubert was an Austrian composer. Schubert died before his 32nd birthday, but was extremely prolific during his lifetime."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/1/15/JohannesBrahms.jpg",
+        "Name": "Johannes Brahms",
+        "Era": "Romantic",
+        "Description": "Johannes Brahms was a German composer and pianist. Born in Hamburg into a Lutheran family, Brahms spent much of his professional life in Vienna, Austria."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/9/9d/RichardWagner.jpg",
+        "Name": "Richard Wagner",
+        "Era": "Romantic",
+        "Description": "Wilhelm Richard Wagner was a German composer, theatre director, polemicist, and conductor who is primarily known for his operas. Unlike most opera composers, Wagner wrote both the libretto and the music for each of his stage works."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/thumb/0/05/Joseph_Haydn.jpg/475px-Joseph_Haydn.jpg",
+        "Name": "Joseph Haydn",
+        "Era": "Classical",
+        "Description": "Joseph Haydn was a prolific Austrian composer of the Classical period. He was instrumental in the development of chamber music such as the piano trio and his contributions to musical form have earned him the epithets \"Father of the Symphony\" and \"Father of the String Quartet\"."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/f/f9/Claude_Debussy_ca_1908,_foto_av_F%C3%A9lix_Nadar.jpg",
+        "Name": "Claude Debussy",
+        "Era": "Impressionist",
+        "Description": "Claude-Achille Debussy was a French composer. He and Maurice Ravel were the most prominent figures associated with Impressionist music, though Debussy disliked the term when applied to his compositions."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/3/3a/Franz_Liszt_by_Nadar,_March_1886.png",
+        "Name": "Frans Liszt",
+        "Era": "Romantic",
+        "Description": "Franz Liszt was a prolific 19th-century Hungarian composer, virtuoso pianist, conductor, music teacher, arranger, and Franciscan tertiary."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/b/b7/Gustav-Mahler-Kohut.jpg",
+        "Name": "Gustav Mahler",
+        "Era": "Romantic",
+        "Description": "Gustav Mahler was an Austrian late-Romantic composer, and one of the leading conductors of his generation. As a composer he acted as a bridge between the 19th century Austro-German tradition and the modernism of the early 20th century."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/c/cc/Igor_Stravinsky_Essays.jpg",
+        "Name": "Igor Stravinsky",
+        "Era": "Modernist",
+        "Description": "Igor Fyodorovich Stravinsky was a Russian composer, pianist, and conductor. He is widely considered one of the most important and influential composers of the 20th century. Stravinsky's compositional career was notable for its stylistic diversity."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/thumb/7/72/Felix_Mendelssohn-Bartholdy_%28AMZ_1837%29.png/1070px-Felix_Mendelssohn-Bartholdy_%28AMZ_1837%29.png",
+        "Name": "Felix Mendelssohn",
+        "Era": "Romantic",
+        "Description": "Jakob Ludwig Felix Mendelssohn Bartholdy, born and widely known as Felix Mendelssohn, was a German composer, pianist, organist and conductor of the early Romantic period."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/9/98/Antonio_Vivaldi_portrait.jpg",
+        "Name": "Antonio Vivaldi",
+        "Era": "Baroque",
+        "Description": "Antonio Lucio Vivaldi was an Italian Baroque composer, virtuoso violinist, teacher and cleric. Born in Venice, he is recognized as one of the greatest Baroque composers, and his influence during his lifetime was widespread across Europe."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/b/be/Sergei_Rachmaninoff_cph.3a40575.jpg",
+        "Name": "Sergei Rachmaninoff",
+        "Era": "Romantic",
+        "Description": "Sergei Vasilievich Rachmaninoff was a Russian pianist, composer, and conductor of the late-Romantic period, some of whose works are among the most popular in the classical repertoire. He is regarded as one of the major composers of the 20th century."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/3/3e/Portrait_of_Robert_Schumann.jpg",
+        "Name": "Robert Schumann",
+        "Era": "Romantic",
+        "Description": "Robert Schumann was a German composer and influential music critic. He is widely regarded as one of the greatest composers of the Romantic era. Schumann left the study of law, intending to pursue a career as a virtuoso pianist."
+    },
+    {
+        "imageURL": "https://upload.wikimedia.org/wikipedia/commons/7/78/Maurice_Ravel_1925.jpg",
+        "Name": "Maurice Ravel",
+        "Era": "Impressionist",
+        "Description": "Joseph Maurice Ravel was a French composer, pianist and conductor. He is often associated with impressionism along with his elder contemporary Claude Debussy, although both composers rejected the term."
+    }
+]
\ No newline at end of file
diff --git a/Node/sample-knowledgeBot/package.json b/Node/sample-knowledgeBot/package.json
index aa7826d5fc..3ad1e88189 100644
--- a/Node/sample-knowledgeBot/package.json
+++ b/Node/sample-knowledgeBot/package.json
@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "botbuilder": "^3.8.2",
+    "dotenv-extended": "^2.0.0",
     "request": "^2.78.0",
     "restify": "^4.2.0"
   }
diff --git a/Node/sample-payments/README.md b/Node/sample-payments/README.md
index a796722022..142039b617 100644
--- a/Node/sample-payments/README.md
+++ b/Node/sample-payments/README.md
@@ -2,6 +2,11 @@
 
 A sample bot showing how to integrate with Microsoft Seller Center for payment processing.
 
+[![Deploy to Azure][Deploy Button]][Deploy Node/Payments]
+
+[Deploy Button]: https://azuredeploy.net/deploybutton.png
+[Deploy Node/Payments]: https://azuredeploy.net
+
 ### Prerequisites
 
 The minimum prerequisites to run this sample are:
diff --git a/Node/sample-payments/azuredeploy.json b/Node/sample-payments/azuredeploy.json
new file mode 100644
index 0000000000..2b30272384
--- /dev/null
+++ b/Node/sample-payments/azuredeploy.json
@@ -0,0 +1,151 @@
+{
+  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "defaultValue": "BotBuilder-Samples",
+      "type": "string"
+    },
+    "hostingPlanName": {
+      "type": "string"
+    },
+    "siteLocation": {
+      "type": "string"
+    },
+    "sku": {
+      "type": "string",
+      "allowedValues": [
+        "Free",
+        "Shared",
+        "Basic",
+        "Standard"
+      ],
+      "defaultValue": "Free"
+    },
+    "workerSize": {
+      "type": "string",
+      "allowedValues": [
+        "0",
+        "1",
+        "2"
+      ],
+      "defaultValue": "0"
+    },
+    "repoUrl": {
+      "type": "string"
+    },
+    "branch": {
+      "type": "string"
+    },
+    "Project": {
+      "type": "string",
+      "defaultValue": "Node/sample-payments"
+    },
+    "WEBSITE_NODE_DEFAULT_VERSION": {
+      "type": "string",
+      "defaultValue": "6.9.5"
+    },
+    "MICROSOFT_APP_ID": {
+      "type": "string"
+    },
+    "MICROSOFT_APP_PASSWORD": {
+      "type": "string"
+    },
+    "PAYMENTS_LIVEMODE": {
+      "type": "bool",
+      "defaultValue": false
+    },
+    "PAYMENTS_MERCHANT_ID": {
+      "type": "string"
+    },
+    "PAYMENTS_STRIPE_API_KEY": {
+      "type": "string"
+    }
+  },
+  "resources": [
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('hostingPlanName')]",
+      "type": "Microsoft.Web/serverFarms",
+      "location": "[parameters('siteLocation')]",
+      "properties": {
+        "name": "[parameters('hostingPlanName')]",
+        "sku": "[parameters('sku')]",
+        "workerSize": "[parameters('workerSize')]",
+        "numberOfWorkers": 1
+      }
+    },
+    {
+      "apiVersion": "2014-06-01",
+      "name": "[parameters('siteName')]",
+      "type": "Microsoft.Web/Sites",
+      "location": "[parameters('siteLocation')]",
+      "dependsOn": [
+        "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]"
+      ],
+      "tags": {
+        "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty"
+      },
+      "properties": {
+        "name": "[parameters('siteName')]",
+        "serverFarm": "[parameters('hostingPlanName')]"
+      },
+      "resources": [
+        {
+          "apiVersion": "2014-04-01",
+          "type": "config",
+          "name": "web",
+          "dependsOn": [
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'))]"
+          ],
+          "properties": {
+            "appSettings": [
+              {
+                "name": "Project",
+                "value": "[parameters('Project')]"
+              },
+              {
+                "name": "WEBSITE_NODE_DEFAULT_VERSION",
+                "value": "[parameters('WEBSITE_NODE_DEFAULT_VERSION')]"
+              },
+              {
+                "name": "MICROSOFT_APP_ID",
+                "value": "[parameters('MICROSOFT_APP_ID')]"
+              },
+              {
+                "name": "MICROSOFT_APP_PASSWORD",
+                "value": "[parameters('MICROSOFT_APP_PASSWORD')]"
+              },
+              {
+                "name": "PAYMENTS_LIVEMODE",
+                "value": "[parameters('PAYMENTS_LIVEMODE')]"
+              },
+              {
+                "name": "PAYMENTS_MERCHANT_ID",
+                "value": "[parameters('PAYMENTS_MERCHANT_ID')]"
+              },
+              {
+                "name": "PAYMENTS_STRIPE_API_KEY",
+                "value": "[parameters('PAYMENTS_STRIPE_API_KEY')]"
+              }
+            ]
+          }
+        },
+        {
+          "apiVersion": "2014-04-01",
+          "name": "web",
+          "type": "sourcecontrols",
+          "dependsOn": [
+            "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]",
+            "[concat('Microsoft.Web/Sites/', parameters('siteName'), '/config/web')]"
+          ],
+          "properties": {
+            "RepoUrl": "[parameters('repoUrl')]",
+            "branch": "[parameters('branch')]",
+            "IsManualIntegration": true
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 92c4f128f8..87291f4d01 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@ Bot Builder samples are organized into groups and designed to illustrate task-fo
 
     git clone https://github.com/Microsoft/BotBuilder-Samples.git
     cd BotBuilder-Samples
+
 ## Core
 These examples show the basic techniques needed to build a great bot.
 
@@ -12,14 +13,22 @@ Sample | Description | C# | Node
 Send Attachment | A sample bot that passes simple media attachments (images) to a user activity. | [View Sample](/CSharp/core-SendAttachment)[![Deploy to Azure][Deploy Button]][Deploy CSharp/SendAttachment] | [View Sample](/Node/core-SendAttachment)[![Deploy to Azure][Deploy Button]][Deploy Node/SendAttachment]
 Receive Attachment | A sample bot that receives attachments sent by the user and downloads them. | [View Sample](/CSharp/core-ReceiveAttachment)[![Deploy to Azure][Deploy Button]][Deploy CSharp/ReceiveAttachment] | [View Sample](/Node/core-ReceiveAttachment)[![Deploy to Azure][Deploy Button]][Deploy Node/ReceiveAttachment]
 Create New Conversation | A sample bot that starts a new conversation using a previously stored user address. | [View Sample](/CSharp/core-CreateNewConversation)[![Deploy to Azure][Deploy Button]][Deploy CSharp/CreateNewConversation] | [View Sample](/Node/core-CreateNewConversation)[![Deploy to Azure][Deploy Button]][Deploy Node/CreateNewConversation]
+Proactive Messages | Three sample bots that proactively send a message to the user. | [View Samples](/CSharp/core-proactiveMessages) | [View Samples](/Node/core-proactiveMessages)
 Get Members of a Conversation | A sample bot that retrieves the conversation's members list and detects when it changes. | [View Sample](/CSharp/core-GetConversationMembers)[![Deploy to Azure][Deploy Button]][Deploy CSharp/GetConversationMembers] | [View Sample](/Node/core-GetConversationMembers)[![Deploy to Azure][Deploy Button]][Deploy Node/GetConversationMembers]
 Direct Line | A sample bot and a custom client communicating to each other using the Direct Line API. | [View Sample](/CSharp/core-DirectLine)[![Deploy to Azure][Deploy Button]][Deploy CSharp/DirectLine] | [View Sample](/Node/core-DirectLine)[![Deploy to Azure][Deploy Button]][Deploy Node/DirectLine]
 Direct Line (WebSockets) | A sample bot and a custom client communicating to each other using the Direct Line API + WebSockets. | [View Sample](/CSharp/core-DirectLineWebSockets)[![Deploy to Azure][Deploy Button]][Deploy CSharp/DirectLineWebSockets] | [View Sample](/Node/core-DirectLineWebSockets)[![Deploy to Azure][Deploy Button]][Deploy Node/DirectLineWebSockets]
+Basic Multi Dialogs | A sample bot showing how to use the dialog stack. | [View Sample](/CSharp/core-BasicMultiDialog)[![Deploy to Azure][Deploy Button]][Deploy CSharp/BasicMultiDialog] | [View Sample](/Node/core-basicMultiDialog)[![Deploy to Azure][Deploy Button]][Deploy Node/BasicMultiDialog]
 Multi Dialogs | A sample bot showing different kind of dialogs. | [View Sample](/CSharp/core-MultiDialogs)[![Deploy to Azure][Deploy Button]][Deploy CSharp/MultiDialogs] | [View Sample](/Node/core-MultiDialogs)[![Deploy to Azure][Deploy Button]][Deploy Node/MultiDialogs]
+Global Message Handlers | A sample bot showing the usage of Global Message Handlers to handle global commands and manipulate the dialog stack. | [View Sample](/CSharp/core-GlobalMessageHandlers)[![Deploy to Azure][Deploy Button]][Deploy CSharp/GlobalMessageHandlers] | [View Sample](/Node/core-globalMessageHandlers)[![Deploy to Azure][Deploy Button]][Deploy Node/GlobalMessageHandlers]
+Simple Task Automation | A sample bot showing how to do simple task automation scenarios. | [View Sample](/CSharp/capability-SimpleTaskAutomation)[![Deploy to Azure][Deploy Button]][Deploy CSharp/SimpleTaskAutomation] | [View Sample](/Node/capability-SimpleTaskAutomation)[![Deploy to Azure][Deploy Button]][Deploy Node/SimpleTaskAutomation]
+Progress Dialog | A sample bot that shows how to create a progress dialog that will periodically notify users of the status of a long running task. | | [View Sample](/Node/core-ProgressDialog)[![Deploy to Azure][Deploy Button]][Deploy Node/ProgressDialog]
 State API | A stateless sample bot tracking context of a conversation. | [View Sample](/CSharp/core-State)[![Deploy to Azure][Deploy Button]][Deploy CSharp/State] | [View Sample](/Node/core-State)[![Deploy to Azure][Deploy Button]][Deploy Node/State]
 Custom State API | A stateless sample bot tracking context of a conversation using a custom storage provider. | [View Sample](/CSharp/core-CustomState)[![Deploy to Azure][Deploy Button]][Deploy CSharp/CustomState] | [View Sample](/Node/core-CustomState)[![Deploy to Azure][Deploy Button]][Deploy Node/CustomState]
 ChannelData | A sample bot sending native metadata to Facebook using ChannelData. | [View Sample](/CSharp/core-ChannelData)[![Deploy to Azure][Deploy Button]][Deploy CSharp/ChannelData] | [View Sample](/Node/core-ChannelData)[![Deploy to Azure][Deploy Button]][Deploy Node/ChannelData]
+ChannelData (Share Button) | A sample bot sending native metadata to Facebook to display a Share button. | [View Sample](/CSharp/Blog-CustomChannelData)[![Deploy to Azure][Deploy Button]][Deploy CSharp/BlogCustomChannelData] | [View Sample](/Node/blog-customChannelData)[![Deploy to Azure][Deploy Button]][Deploy Node/BlogCustomChannelData]
 AppInsights | A sample bot which logs telemetry to an Application Insights instance. | [View Sample](/CSharp/core-AppInsights)[![Deploy to Azure][Deploy Button]][Deploy CSharp/AppInsights] | [View Sample](/Node/core-AppInsights)[![Deploy to Azure][Deploy Button]][Deploy Node/AppInsights]
+Middleware Logging | A basic bot that logs incoming and outgoing messages. | [View Sample](/CSharp/core-Middleware)[![Deploy to Azure][Deploy Button]][Deploy CSharp/MiddlewareLogging] | [View Sample](/Node/capability-middlewareLogging)[![Deploy to Azure][Deploy Button]][Deploy Node/MiddlewareLogging]
+Bot in Apps | A sample bot showing how to go beyond by becoming embedded into larger applications. | [View Sample](/CSharp/capability-BotInApps) |
 
 ## Cards
 These examples emphasize the rich card support in Bot Framework.
@@ -28,6 +37,7 @@ Sample | Description | C# | Node
 ------------ | ------------- | :-----------: | :-----------:
 Rich Cards | A sample bot to renders several types of cards as attachments. | [View Sample](/CSharp/cards-RichCards)[![Deploy to Azure][Deploy Button]][Deploy CSharp/RichCards] | [View Sample](/Node/cards-RichCards)[![Deploy to Azure][Deploy Button]][Deploy Node/RichCards]
 Carousel of Cards | A sample bot that sends multiple rich card attachments in a single message using the Carousel layout. | [View Sample](/CSharp/cards-CarouselCards)[![Deploy to Azure][Deploy Button]][Deploy CSharp/CarouselCards] | [View Sample](/Node/cards-CarouselCards)[![Deploy to Azure][Deploy Button]][Deploy Node/CarouselCards]
+Cards as Attachments | A sample bot that renders several types of cards as attachments, while also showing the generated JSON for each one of these cards at the message's payload. | [View Sample](/CSharp/demo-CardsAttachments)[![Deploy to Azure][Deploy Button]][Deploy CSharp/DemoCardAttachements] | 
 
 ## Intelligence
 Build bots with powerful algorithms using Bing & Microsoft Cognitive Services APIs.
@@ -46,8 +56,12 @@ These are bots designed to showcase end-to-end sample scenarios. They're great s
 Sample | Description | C# | Node
 ------------ | ------------- | :-----------: | :-----------:
 Contoso Flowers | A reference implementation using many features from BotFramework. | [View Sample](/CSharp/demo-ContosoFlowers)[![Deploy to Azure][Deploy Button]][Deploy CSharp/ContosoFlowers] | [View Sample](/Node/demo-ContosoFlowers)[![Deploy to Azure][Deploy Button]][Deploy Node/ContosoFlowers]
-Azure Search | Two sample bots that help the user navigate large amounts of content. | [View Samples](/CSharp/demo-Search) | [View Samples](/Node/demo-Search)
-
+Azure Search | Two sample bots that help the user navigate large amounts of content. | [View Samples](/CSharp/demo-Search) | [View Samples](/Node/demo-Search)[![Deploy to Azure][Deploy Button]][Deploy Node/Search]
+Knowledge Bot | A sample that uses Azure Document DB and Azure Search that searches and filters over an underlying dataset. | [View Sample](/CSharp/sample-KnowledgeBot)[![Deploy to Azure][Deploy Button]][Deploy CSharp/KnowledgeBot] | [View Sample](/Node/sample-knowledgeBot)[![Deploy to Azure][Deploy Button]][Deploy Node/KnowledgeBot]
+Roller Skill | A simple dice rolling skill/bot that's been optimized for speech enabled channels, like Cortana. | [View Sample](/CSharp/demo-RollerSkill)[![Deploy to Azure][Deploy Button]][Deploy CSharp/RollerSkill] | [View Sample](/Node/demo-RollerSkill)[![Deploy to Azure][Deploy Button]][Deploy Node/RollerSkill]
+Payments | A sample bot showing how to integrate with Microsoft Seller Center for payment processing. | [View Sample](/CSharp/sample-payments)[![Deploy to Azure][Deploy Button]][Deploy CSharp/Payments] | [View Sample](/Node/sample-payments)[![Deploy to Azure][Deploy Button]][Deploy Node/Payments]
+LUIS Action Binding | A sample that contains a core implementation for doing LUIS Action Binding. | [View Sample](/CSharp/Blog-LUISActionBinding)[![Deploy to Azure][Deploy Button]][Deploy CSharp/LUISActionBinding] | [View Sample](/Node/blog-LUISActionBinding)
+Skype Calling | A sample bot showing how to use the Skype Bot Plaform for Calling API for receiving and handling Skype voice calls. | [View Sample](/CSharp/skype-CallingBot)[![Deploy to Azure][Deploy Button]][Deploy CSharp/SkypeCallingBot] |
 
 [Deploy Button]: https://azuredeploy.net/deploybutton.png
 [Deploy CSharp/SendAttachment]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/core-SendAttachment
@@ -76,6 +90,7 @@ Azure Search | Two sample bots that help the user navigate large amounts of cont
 [Deploy Node/LUIS]: https://azuredeploy.net/?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/intelligence-LUIS
 [Deploy CSharp/ChannelData]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/core-ChannelData
 [Deploy Node/ChannelData]: https://azuredeploy.net/?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/core-ChannelData
+[Deploy Node/BlogCustomChannelData]: https://azuredeploy.net/?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/blog-customChannelData
 [Deploy CSharp/ContosoFlowers]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/demo-ContosoFlowers
 [Deploy Node/ContosoFlowers]: https://azuredeploy.net/?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/demo-ContosoFlowers
 [Deploy CSharp/ImageCaption]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/intelligence-ImageCaption
@@ -88,3 +103,23 @@ Azure Search | Two sample bots that help the user navigate large amounts of cont
 [Deploy Node/AppInsights]: https://azuredeploy.net/?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/core-AppInsights
 [Deploy CSharp/Zummer]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/intelligence-Zummer
 [Deploy Node/Zummer]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/intelligence-Zummer
+[Deploy Node/ProgressDialog]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/core-ProgressDialog
+[Deploy Node/RollerSkill]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/demo-RollerSkill
+[Deploy Node/Search]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/demo-Search
+[Deploy Node/MiddlewareLogging]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/capability-middlewareLogging
+[Deploy Node/SimpleTaskAutomation]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/capability-SimpleTaskAutomation
+[Deploy Node/BasicMultiDialog]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/core-basicMultiDialog
+[Deploy Node/GlobalMessageHandlers]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/core-globalMessageHandlers
+[Deploy Node/KnowledgeBot]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/sample-knowledgeBot
+[Deploy Node/Payments]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/Node/sample-payments
+[Deploy CSharp/BasicMultiDialog]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/core-BasicMultiDialog
+[Deploy CSharp/GlobalMessageHandlers]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/core-GlobalMessageHandlers
+[Deploy CSharp/SimpleTaskAutomation]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/capability-SimpleTaskAutomation
+[Deploy CSharp/BlogCustomChannelData]: https://azuredeploy.net/?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/Blog-CustomChannelData
+[Deploy CSharp/MiddlewareLogging]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/core-Middleware
+[Deploy CSharp/DemoCardAttachements]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/demo-CardsAttachments
+[Deploy CSharp/KnowledgeBot]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/sample-KnowledgeBot
+[Deploy CSharp/RollerSkill]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/demo-RollerSkill
+[Deploy CSharp/Payments]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/sample-payments
+[Deploy CSharp/LUISActionBinding]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/Blog-LUISActionBinding
+[Deploy CSharp/SkypeCallingBot]: https://azuredeploy.net?repository=https://github.com/microsoft/BotBuilder-Samples/tree/master/CSharp/skype-CallingBot