Merged V2.1 to HEAD

6933:  Various fixes for cross-site javascript and associated trickery to web-client UI screens
Plus fixes to several dialogs broken in use-the-link dialog conversion changes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/users/UsersBeanProperties.java

@@ -51,15 +51,13 @@ public class UsersBeanProperties
     /** action context */
     private Node person = null;
     
-   
-    
     private String password = null;
     private String oldPassword = null;
     private String confirm = null;
     private String searchCriteria = null;
     
     
- // ------------------------------------------------------------------------------
+    // ------------------------------------------------------------------------------
     // Bean property getters and setters
 
     /**
@@ -142,8 +140,6 @@ public class UsersBeanProperties
        this.usersRichList = usersRichList;
     }
 
- 
-    
     /**
      * @return Returns the search criteria
      */
@@ -223,6 +219,4 @@ public class UsersBeanProperties
     {
        this.person = person;
     }
-
-    
 }