Merge branch 'develop' of http://git.dev.yoho.cn/web/yohood into develop

@@ -124,6 +124,7 @@ define('admin/brand',function(require, exports)
         );
         );
         initLogoUp();
         initLogoUp();
         initPicUp();
         initPicUp();
+        init_upload_video();
     });
     });