Merge branch 'beta' into HK

js/app/Onload.js

@@ -1118,7 +1118,7 @@ function loginSet(userInfo, res){
             window.location.reload();
         }, [], { "type": "POST", "withCredentials": true });
     } else {
-        // loginPan(userInfo, userId)
+        loginPan(userInfo, userId)
         U.MD.D.I.openApplication('cocoflowDeskTop')
     }
     // if($(".U_PBL_Check2")[0]){