Merge remote-tracking branch 'origin/master'

pm2.json

+{
+  "apps": [
+    {
+      "name": "app",
+      "script": "./app.js",
+      "merge_logs": true,
+      "log_date_format": "HH:mm"
+    }
+  ]
+}