Merge remote-tracking branch 'refs/remotes/origin/master' into 1.8.0-dev

src/main/webapp/js/admin/latkeAdmin.js

@@ -1356,7 +1356,7 @@ admin.article = {
         var filename = "";
         $('#articleUpload').fileupload({
             multipart: true,
-            url: "http://upload.qiniu.com/",
+            url: "https://up.qbox.me",
             add: function (e, data) {
                 filename = data.files[0].name;