Merge branch 'dev' into alpha

# Conflicts:
#	packages/uni-mp-kuaishou/package.json

package.json

@@ -23,7 +23,7 @@
     "build:mp-weixin:mp": "cross-env UNI_PLATFORM=mp-weixin UNI_MP=true rollup -c build/rollup.config.mp.js",
     "build:mp-weixin:wxs": "rollup -c build/rollup.config.wxs.js",
     "build:quickapp-native": "cross-env NODE_ENV=development node build/build.qa.js && cross-env NODE_ENV=production node build/build.qa.js",
-    "build:runtime": "npm run lint && npm run build:mp-weixin && npm run build:mp-qq && npm run build:mp-alipay && npm run build:mp-baidu && npm run build:mp-toutiao && npm run build:app-plus && npm run build:quickapp-webview && npm run build:quickapp-native",
+    "build:runtime": "npm run lint && npm run build:mp-weixin && npm run build:mp-qq && npm run build:mp-alipay && npm run build:mp-baidu && npm run build:mp-toutiao && npm run build:app-plus && npm run build:quickapp-webview && npm run build:quickapp-native && build:mp-kuaishou",
     "build:stat": "npm run lint && rollup -c build/rollup.config.stat.js",
     "build:web-view": "rollup -c build/rollup.config.web-view.js",
     "test:cli": "cross-env NODE_ENV=test jest",

packages/uni-mp-kuaishou/package.json

@@ -5,13 +5,16 @@
   "main": "dist/index.js",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/aeroxy/uni-app.git",
+    "url": "git+https://github.com/dcloudio/uni-app.git",
     "directory": "packages/uni-mp-kuaishou"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Aero Wang",
-  "license": "MIT",
-  "gitHead": "e51484a49748f7bff86bb833763e5dff1522d380"
+  "license": "Apache-2.0",
+  "uni-app": {
+    "name": "mp-alipay",
+    "title": "支付宝小程序"
+  }
 }