Merge branch 'master' of https://github.com/mattermost/platform

README.md

@@ -91,7 +91,7 @@ AWS Elastic Beanstalk Setup (Docker)
 	2. Select "Create New Application" from the top right.
 	3. Name the application and press next
 	4. Select "Create a web server" environment.
-	5. If asked, select create and AIM role and instance profile and press next.
+	5. If asked, select create and IAM role and instance profile and press next.
 	6. For predefined configuration select docker. For environment type select single instance. 
 	7. For application source, select upload your own and upload Dockerrun.aws.json from docker/Dockerrun.aws.json. Everything else may be left at default.
 	8. Select an environment name, this is how you will refer to your environment. Make sure the URL is available then press next.

api/web_socket_test.go

@@ -119,7 +119,7 @@ func TestSocket(t *testing.T) {
 
 }
 
-func TestZZWebScoketTearDown(t *testing.T) {
+func TestZZWebSocketTearDown(t *testing.T) {
 	// *IMPORTANT* - Kind of hacky
 	// This should be the last function in any test file
 	// that calls Setup()