t push origin masterMerge branch 'oliverxchen-master'

Author: napcs

package-lock.json

@@ -25,7 +25,7 @@
   "dependencies": {
     "chokidar": "^2.1.5",
     "opts": ">= 1.2.0",
-    "ws": "^1.1.5"
+    "ws": "^6.2.1"
   },
   "devDependencies": {
     "coffee-script": ">= 1.8.0",