Merge remote-tracking branch 'origin/develop' into develop

src/custom/restcontroller/ClientUserInfo.java

@@ -12,7 +12,9 @@ public class ClientUserInfo extends UserInfo {
     public ClientUserInfo(Controller controller) {
         super(controller);
     }
-
+    public static Row setLoginReturn(long usersiteid, Row userrow) {
+        return userrow;
+    }
     private Row hrRow = null;
     private Row enterpriseRow = null;
     private Row enterprise_HrRow = null;