Merge branch 'master' into mm-1391

config/config_docker.json

@@ -10,7 +10,7 @@
     "ServiceSettings": {
         "SiteName": "Mattermost",
         "Domain": "",
-        "Mode" : "prod",
+        "Mode" : "dev",
 		"AllowTesting" : false,
         "UseSSL": false,
         "Port": "80",