Merge branch 'master' into PLT-1429

2016-02-03 10:45:58 -08:00
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -68,6 +68,8 @@
    },
    "EmailSettings": {
        "EnableSignUpWithEmail": true,
+        "EnableSignInWithEmail": true,
+        "EnableSignInWithUsername": false,
        "SendEmailNotifications": false,
        "RequireEmailVerification": false,
        "FeedbackName": "",
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -68,6 +68,8 @@
    },
    "EmailSettings": {
        "EnableSignUpWithEmail": true,
+        "EnableSignInWithEmail": true,
+        "EnableSignInWithUsername": false,
        "SendEmailNotifications": false,
        "RequireEmailVerification": false,
        "FeedbackName": "",