Merge branch 'master' into anna/master

Author: Cookiezaurs

package-lock.json

@@ -45,7 +45,7 @@
     "async": "3.2.6",
     "basic-auth": "2.0.1",
     "bluebird": "3.7.2",
-    "body-parser": "2.2.0",
+    "body-parser": "2.2.1",
     "bunyan": "1.8.15",
     "colors": "1.4.0",
     "connect-flash": "0.1.1",
@@ -87,7 +87,7 @@
     "moment-timezone": "0.6.0",
     "mongodb": "6.20.0",
     "nginx-conf": "2.1.0",
-    "nodemailer": "7.0.10",
+    "nodemailer": "7.0.11",
     "object-hash": "3.0.0",
     "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
     "properties-parser": "0.6.0",