Merge branch 'master' into advanced-permissions-phase-1

2018-03-13 13:36:23 +00:00
--- a/config/default.json
+++ b/config/default.json
@@ -358,7 +358,13 @@
        "DailyRunTime": "01:00",
        "ExportFromTimestamp": 0,
        "FileLocation": "export",
-        "BatchSize": 10000
+        "BatchSize": 10000,
+        "GlobalRelaySettings": {
+            "CustomerType": "A9",
+            "SmtpUsername": "",
+            "SmtpPassword": "",
+            "EmailAddress": ""
+        }
    },
    "JobSettings": {
        "RunJobs": true,