=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2015-09-26 16:08:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2015-10-13 15:48:34 +0000
@@ -286,8 +286,6 @@
 intro_schedule_automated_aggregation = Schedule an automated tracked entity aggregation process, e.g. to run all pre-defined aggregation queries every midnight.
 execute_tasks_confirmation=Are you sure you want to execute all tasks now? Task processing might fully utilize your system resources and slow down other operations.
 executing = Executing
-add_single_rule = Add single rule
-add_multi_rule = Add multi rule
 no_aggregation = No aggregation
 age_at_visit_days_since_birth = Age at visit (days since birth)
 formula = Formula
@@ -457,7 +455,7 @@
 data_entry_method_for_option_sets=Data entry method for option sets
 users = Users
 attribute_users = Attribute users
-view_reminder_message_templates = View reminder message templatess
+view_reminder_message_templates = View reminder message templates
 display_in_list_no_program = Display in list without program
 manage_attributes_with_no_program = Manage attributes with no program
 manage_attributes_for_visit_schedule = Manage attributes for visit schedule

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java	2015-09-09 20:18:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java	2015-10-13 15:48:34 +0000
@@ -44,7 +44,6 @@
 
 /**
  * @author Thanh Nguyen
- * @version $Id: AddRoleAction.java 5701 2008-09-14 20:34:46Z larshelg $
  */
 public class AddRoleAction
     implements Action
@@ -101,19 +100,19 @@
     {
         this.selectedListAuthority = selectedListAuthority;
     }
-    
-	private Collection<String> selectedProgramList = new ArrayList<>();
-
-	public void setSelectedProgramList(Collection<String> selectedProgramList) {
-		this.selectedProgramList = selectedProgramList;
-	}
+
+    private Collection<String> selectedProgramList = new ArrayList<>();
+
+    public void setSelectedProgramList( Collection<String> selectedProgramList )
+    {
+        this.selectedProgramList = selectedProgramList;
+    }
 
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
-
-  
-	@Override
+    
+    @Override
     public String execute()
         throws Exception
     {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java	2015-09-09 20:18:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java	2015-10-13 15:48:34 +0000
@@ -44,7 +44,6 @@
 
 /**
  * @author Thanh Nguyen
- * @version $Id: UpdateRoleAction.java 5701 2008-09-14 20:34:46Z larshelg $
  */
 public class UpdateRoleAction
     implements Action
@@ -70,13 +69,6 @@
     @Autowired
     private ProgramService programService;
     
-    private String message;
-
-    public String getMessage()
-    {
-        return message;
-    }
-
     // -------------------------------------------------------------------------
     // Input
     // -------------------------------------------------------------------------
@@ -115,12 +107,13 @@
     {
         this.selectedListAuthority = selectedListAuthority;
     }
-    
+
     private Collection<String> selectedProgramList = new ArrayList<>();
 
-	public void setSelectedProgramList(Collection<String> selectedProgramList) {
-		this.selectedProgramList = selectedProgramList;
-	}
+    public void setSelectedProgramList( Collection<String> selectedProgramList )
+    {
+        this.selectedProgramList = selectedProgramList;
+    }
 
     // -------------------------------------------------------------------------
     // Action implementation