Merge remote-tracking branch 'origin/master'

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxa05f3aff24dba698",
+        "appid" : "wx2db9c41e85d5a4fc",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,