Merge branch 'master' into dockerfile

Author: barakbd

package-lock.json

@@ -35,7 +35,7 @@
     "mime": "2.4.0",
     "mongodb": "3.1.10",
     "parse": "2.1.0",
-    "pg-promise": "8.5.2",
+    "pg-promise": "8.5.3",
     "redis": "2.8.0",
     "semver": "5.6.0",
     "tv4": "1.3.0",
@@ -67,7 +67,7 @@
     "lint-staged": "^7.2.2",
     "mongodb-runner": "4.3.2",
     "nyc": "^12.0.2",
-    "prettier": "1.15.2",
+    "prettier": "1.15.3",
     "supports-color": "^5.4.0"
   },
   "scripts": {