Merge branch 'mc'

package.json

@@ -11,19 +11,20 @@
   ],
   "author": "zh99998 <zh99998@gmail.com>, mercury233 <me@mercury233.me>, Nanahira <78877@qq.com>",
   "dependencies": {
+    "async": "^3.2.0",
     "bunyan": "latest",
+    "challonge": "latest",
     "deepmerge": "latest",
+    "formidable": "latest",
+    "geoip-country-lite": "latest",
     "load-json-file": "latest",
     "moment": "latest",
+    "pg": "^6.4.2",
     "redis": "latest",
-    "formidable": "latest",
     "request": "latest",
+    "sqlite3": "latest",
     "underscore": "latest",
     "underscore.string": "latest",
-    "sqlite3": "latest",
-    "geoip-country-lite": "latest",
-    "challonge": "latest",
-    "pg": "^6.4.2",
     "ws": "^1.1.1"
   },
   "license": "AGPL-3.0",