Merge branch 'master' into tb-auth

samples/spring-echo/src/main/java/com/microsoft/bot/sample/spring/Application.java

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.bot.sample.spring;
 
 import org.springframework.boot.SpringApplication;

samples/spring-echo/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 MicrosoftAppId=9c286e2f-e070-4af5-a3f1-350d666214ed
-MicrosoftAppPassword=b0tframew0rk s3cr3t!
+MicrosoftAppPassword=botframework_secret_goes_here

samples/spring-echo/src/test/java/com/microsoft/bot/sample/spring/ApplicationTests.java

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.bot.sample.spring;
 
 import org.junit.Test;