Merge branch 'master' into development

Bringing beta up to date with production v1.0.40

app/logging.js

@@ -93,8 +93,19 @@ function fetch(logPath) {
     return path.join(logPath, file)
   });
 
+  // creating a manual log entry for the final log result
+  var now = new Date();
+  const fileListEntry = {
+    level: 30, // INFO
+    time: now.toJSON(),
+    msg: 'Loaded this list of log files from logPath: ' + files.join(', '),
+  };
+
   return Promise.all(paths.map(fetchLog)).then(function(results) {
     const data = _.flatten(results);
+
+    data.push(fileListEntry);
+
     return _.sortBy(data, 'time');
   });
 }