=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSection.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSection.java	2014-06-12 09:41:31 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSection.java	2014-06-13 10:58:05 +0000
@@ -64,17 +64,19 @@
 
     public ProgramStageSection()
     {
-
+        setAutoFields();
     }
 
     public ProgramStageSection( String name, List<ProgramStageDataElement> programStageDataElements )
     {
+        setAutoFields();
         this.name = name;
         this.programStageDataElements = programStageDataElements;
     }
 
     public ProgramStageSection( String name, List<ProgramStageDataElement> programStageDataElements, Integer sortOrder )
     {
+        setAutoFields();
         this.name = name;
         this.programStageDataElements = programStageDataElements;
         this.sortOrder = sortOrder;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java	2014-05-26 13:29:12 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java	2014-06-13 10:58:05 +0000
@@ -116,10 +116,12 @@
 
     public TrackedEntityInstanceReminder()
     {
+        setAutoFields();
     }
 
     public TrackedEntityInstanceReminder( String name, Integer daysAllowedSendMessage, String templateMessage )
     {
+        setAutoFields();
         this.name = name;
         this.daysAllowedSendMessage = daysAllowedSendMessage;
         this.templateMessage = templateMessage;
@@ -128,6 +130,7 @@
     public TrackedEntityInstanceReminder( String name, Integer daysAllowedSendMessage, String templateMessage, String dateToCompare,
         Integer sendTo, Integer whenToSend, Integer messageType )
     {
+        setAutoFields();
         this.name = name;
         this.daysAllowedSendMessage = daysAllowedSendMessage;
         this.templateMessage = templateMessage;

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2014-06-03 11:56:13 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java	2014-06-13 10:58:05 +0000
@@ -271,6 +271,8 @@
         updateAggregateQueryBuilder();
         
         executeSql( "UPDATE trackedentityaudit SET accessedmodule='tracked_entity_instance_dashboard' WHERE accessedmodule='instance_dashboard' or accessedmodule='patient_dashboard'" );
+        
+        updateUidColumn();
     }
 
     // -------------------------------------------------------------------------
@@ -406,6 +408,41 @@
         }
     }
 
+    private void updateUidColumn()
+    {
+        updateUidColumn( "trackedentityinstancereminder" );
+        updateUidColumn( "programvalidation" );
+    }
+
+    private void updateUidColumn( String tableName )
+    {
+        StatementHolder holder = statementManager.getHolder();
+
+        try
+        {
+            Statement statement = holder.getStatement();
+
+            ResultSet resultSet = statement.executeQuery( "SELECT " + tableName + "id FROM " + tableName
+                + " where uid is null" );
+
+            while ( resultSet.next() )
+            {
+                String uid = CodeGenerator.generateCode();
+
+                executeSql( "UPDATE " + tableName + " SET uid='" + uid + "'  WHERE " + tableName + "id="
+                    + resultSet.getInt( 1 ) );
+            }
+        }
+        catch ( Exception ex )
+        {
+            log.debug( ex );
+        }
+        finally
+        {
+            holder.close();
+        }
+    }
+    
     private int executeSql( String sql )
     {
         try

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityInstanceReminder.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityInstanceReminder.hbm.xml	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityInstanceReminder.hbm.xml	2014-06-13 10:58:05 +0000
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"
+  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
+  >
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.trackedentity.TrackedEntityInstanceReminder" table="trackedentityinstancereminder">
@@ -9,6 +11,8 @@
     <id name="id" column="trackedentityinstancereminderid">
       <generator class="native" />
     </id>
+     
+     &identifiableProperties;
     
     <property name="name" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCaseAggregation.vm	2012-06-04 04:06:04 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCaseAggregation.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "caseAggregation":
   {
     "id": "${caseAggregation.id}",
+	"uid": "${caseAggregation.uid}",
 	"name": "$!encoder.jsonEncode( ${caseAggregation.name} )",
 	"operator": "${caseAggregation.operator}",
 	"aggregationDataElement": "$!encoder.jsonEncode( ${caseAggregation.aggregationDataElement.name} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "program":
   {
     "id": "$program.id",
+	"uid": "$program.uid",
 	"name": "$!encoder.jsEncode( ${program.name} )",
 	"description": "$!encoder.jsEncode( ${program.description} )",
 	"type": "$!program.type",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramIndicator.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramIndicator.vm	2013-04-17 07:58:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramIndicator.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "programIndicator": 
   {
     "id": $!{programIndicator.id},
+    "uid": "$!{programIndicator.uid}",
     "name": "$!encoder.jsonEncode( ${programIndicator.displayName} )",
     "code": "$!encoder.jsonEncode( ${programIndicator.code} )",
 	"description": "$!encoder.xmlEncode( ${programIndicator.displayDescription} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "programStage":
   {
     "id": "${programStage.id}",
+	"uid": "${programStage.uid}",
 	"name": "$!encoder.jsonEncode( ${programStage.name} )",
 	"description": "$!encoder.jsonEncode( ${programStage.description} )",
 	"minDaysFromStart": "${programStage.minDaysFromStart}",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStageSection.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStageSection.vm	2012-09-17 06:40:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStageSection.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "programStageSection":
   {
     "id": "$!{section.id}",
+    "uid": "$!{section.uid}",
     "name": "$!encoder.jsonEncode( ${section.name} )",
     "dataElementCount": "$!{section.programStageDataElements.size()}"
   }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramValidation.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramValidation.vm	2013-02-05 14:51:56 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramValidation.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "validation":
   {
     "id": "${validation.id}",
+	"uid": "${validation.uid}",
 	"description": "$!encoder.htmlEncode( ${validation.name} )",
 	"operator": "$!encoder.htmlEncode( ${validation.operator} )",
 	"leftSideDescription": "$!encoder.htmlEncode( ${validation.leftSide.description} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonRelationshipType.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonRelationshipType.vm	2012-02-27 01:07:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonRelationshipType.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "relationshipType":
   {
     "id": "${relationshipType.id}",
+	"uid": "${relationshipType.uid}",
 	"aIsToB": "$!encoder.jsonEncode( ${relationshipType.aIsToB} )",
 	"bIsToA": "$!encoder.jsonEncode( ${relationshipType.bIsToA} )",
 	"description": "$!encoder.jsonEncode( ${relationshipType.name} )"

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntity.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntity.vm	2014-02-17 15:00:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntity.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "trackedEntity": 
   {
     "id": $!{trackedEntity.id},
+    "uid": "$!{trackedEntity.uid}",
     "name": "$!encoder.jsonEncode( ${trackedEntity.displayName} )",
     "description": "$!encoder.jsonEncode( ${trackedEntity.displayDescription} )"
   } 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttribute.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttribute.vm	2014-04-18 08:58:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttribute.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "attribute":
   {
     "id": "${attribute.id}",
+	"uid": "${attribute.uid}",
 	"name": "$!encoder.jsonEncode( ${attribute.name} )",
 	"code": "$!encoder.jsonEncode( ${attribute.code} )",
 	"description": "$!encoder.jsonEncode( ${attribute.description} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttributeGroup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttributeGroup.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttributeGroup.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "attributeGroup":
   {
     "id": "${attributeGroup.id}",
+    "uid": "${attributeGroup.uid}",
     "name": "$!encoder.jsonEncode( ${attributeGroup.name} )",
 	"description": "$!encoder.jsonEncode( ${attributeGroup.description} )",
 	"noAttribute": "${attributeGroup.attributes.size()}"

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityInstanceReminder.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityInstanceReminder.vm	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityInstanceReminder.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "reminder": 
   {
     "id": $!{reminder.id},
+    "uid": "$!{reminder.uid}",
     "name": "$!encoder.jsonEncode( ${reminder.displayName} )",
     "daysAllowedSendMessage": "$!{reminder.daysAllowedSendMessage}",
     "templateMessage": "$!encoder.jsonEncode( ${reminder.templateMessage} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonValidationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonValidationCriteria.vm	2011-10-05 06:56:56 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonValidationCriteria.vm	2014-06-13 10:58:05 +0000
@@ -1,6 +1,7 @@
 { "validationCriteria":
   {
 	"id": "$!{validationCriteria.id}",
+	"uid": "$!{validationCriteria.uid}",
 	"name": "$!encoder.xmlEncode( $validationCriteria.name )",
 	"description": "$!encoder.xmlEncode($validationCriteria.description )",
 	"property": "$!i18n.getString($validationCriteria.property)",

=== 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	2014-06-04 11:14:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties	2014-06-13 10:58:05 +0000
@@ -157,7 +157,7 @@
 create_new_program_validation_rule=Create new program validation rule
 add_multi_program_validation_rule=Add multi-program validation rule
 program_validation_rule_details=Program validation rule details
-program_validation_rule_management=Program validation rule management
+view_validation_rule=View validation rule
 tracked_entity_attribute_group_sort_order=Tracked entity attribute group sort order
 scheduled_days_from_start=Scheduled days from start
 success_delete_program_attribute_option=Deleted program attribute option successfully
@@ -366,7 +366,7 @@
 incident_date = Incident date
 date_to_compare = Date to compare
 program_indicator_management = Program Indicator Management
-program_indicator_management_form = Program indicator management
+view_program_indicator = View program indicator
 confirm_delete_prorgam_indicator=Are you sure you want to delete this program indicator?
 program_indicator_details = Program indicator details
 date_for_calculating = Date for calculating

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attribute.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attribute.vm	2014-05-17 12:04:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attribute.vm	2014-06-13 10:58:05 +0000
@@ -52,16 +52,16 @@
       <div id="detailsArea">
         <div id="hideDetailsArea">
           <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
-				</div>
-        <p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
-        <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
-        <p><label class="bold">$i18n.getString( "unique" ):</label><br><span id="uniqueField"></span></p>
-        <p><label class="bold">$i18n.getString( "scope" ):</label><br><span id="scopeField"></span></p>
-        <p><label class="bold">$i18n.getString( "inherit" ):</label><br><span id="inheritField"></span></p>
-		<p><label class="bold">$i18n.getString( "value_type" ):</label><br><span id="valueTypeField"></span></p>
-		<p><label class="bold">$i18n.getString( "option_set" ):</label><br><span id="optionSetField"></span></p>
-       	
-		</div>
+			</div>
+				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
+				<p><label class="bold">$i18n.getString( "unique" ):</label><br><span id="uniqueField"></span></p>
+				<p><label class="bold">$i18n.getString( "scope" ):</label><br><span id="scopeField"></span></p>
+				<p><label class="bold">$i18n.getString( "inherit" ):</label><br><span id="inheritField"></span></p>
+				<p><label class="bold">$i18n.getString( "value_type" ):</label><br><span id="valueTypeField"></span></p>
+				<p><label class="bold">$i18n.getString( "option_set" ):</label><br><span id="optionSetField"></span></p>
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
+			</div>
 
 		</td>
   </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeGroup.vm	2014-04-15 10:11:11 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeGroup.vm	2014-06-13 10:58:05 +0000
@@ -47,10 +47,11 @@
       <div id="detailsArea">
         <div id="hideDetailsArea">
           <a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
-        </div>
-        <p><label class="bold">$i18n.getString( "name" )</label><br><span id="nameField"></span></p>
-        <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
-        <p><label class="bold">$i18n.getString( "number_of_attribute" ):</label><br><span id="noAttributeField"></span></p>
+			</div>
+				<p><label class="bold">$i18n.getString( "name" )</label><br><span id="nameField"></span></p>
+				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
+				<p><label class="bold">$i18n.getString( "number_of_attribute" ):</label><br><span id="noAttributeField"></span></p>
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 			</div>
 		</td>
   </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm	2014-05-17 12:04:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm	2014-06-13 10:58:05 +0000
@@ -61,15 +61,16 @@
 		<td id="detailsData">
       <div id="detailsArea">
         <div id="hideDetailsArea">
-					<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
+			<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( 'hide_details' )"></a>
 				</div>				
-        <p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
-        <p><label class="bold">$i18n.getString( "operator" ):</label><br><span id="operatorField"></span></p>
-        <p><label class="bold">$i18n.getString( "aggregation_data_element" ):</label><br><span id="aggregationDataElementField"></span></p>
-		<p><label class="bold">$i18n.getString( "option_combo" ):</label><br><span id="optionComboField"></span></p>
-        <p><label class="bold">$i18n.getString( "data_element_for_sum_avg_min_max" ):</label><br><span id="deSumField"></span></p>
-        <p><label class="bold">$i18n.getString( "aggregation_expression" ):</label><br><span id="aggregationExpressionField"></span></p>
-			</div>
+					<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+					<p><label class="bold">$i18n.getString( "operator" ):</label><br><span id="operatorField"></span></p>
+					<p><label class="bold">$i18n.getString( "aggregation_data_element" ):</label><br><span id="aggregationDataElementField"></span></p>
+					<p><label class="bold">$i18n.getString( "option_combo" ):</label><br><span id="optionComboField"></span></p>
+					<p><label class="bold">$i18n.getString( "data_element_for_sum_avg_min_max" ):</label><br><span id="deSumField"></span></p>
+					<p><label class="bold">$i18n.getString( "aggregation_expression" ):</label><br><span id="aggregationExpressionField"></span></p>
+					<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
+				</div>
 		</td>
   </tr>
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/attribute.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/attribute.js	2014-05-17 12:04:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/attribute.js	2014-06-13 10:58:05 +0000
@@ -20,6 +20,7 @@
 			setInnerHTML( 'nameField', json.attribute.name );	
 			setInnerHTML( 'descriptionField', json.attribute.description );
 			setInnerHTML( 'optionSetField', json.attribute.optionSet );
+			setInnerHTML( 'idField', json.attribute.uid );
 			
 			var unique = ( json.attribute.unique == 'true') ? i18n_yes : i18n_no;
 			setInnerHTML( 'uniqueField', unique );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/attributeGroup.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/attributeGroup.js	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/attributeGroup.js	2014-06-13 10:58:05 +0000
@@ -19,6 +19,7 @@
       setInnerHTML('nameField', json.attributeGroup.name);
       setInnerHTML('descriptionField', json.attributeGroup.description);
       setInnerHTML('noAttributeField', json.attributeGroup.noAttribute);
+      setInnerHTML('idField', json.attributeGroup.uid);
 
       showDetails();
     });

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/caseaggregation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/caseaggregation.js	2014-06-01 13:44:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/caseaggregation.js	2014-06-13 10:58:05 +0000
@@ -278,6 +278,7 @@
     setInnerHTML('optionComboField', json.caseAggregation.optionCombo);
     setInnerHTML('aggregationExpressionField', json.caseAggregation.aggregationExpression);
     setInnerHTML('deSumField', json.caseAggregation.deSum);
+    setInnerHTML('idField', json.caseAggregation.uid);
     showDetails();
   });
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js	2014-06-02 04:53:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js	2014-06-13 10:58:05 +0000
@@ -47,6 +47,7 @@
   }, function( json ) {
     setInnerHTML('nameField', json.program.name);
     setInnerHTML('descriptionField', json.program.description);
+    setInnerHTML('idField', json.program.uid);
 
     var type = i18n_multiple_events_with_registration;
     if( json.program.type == "2" )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js	2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js	2014-06-13 10:58:05 +0000
@@ -25,6 +25,7 @@
     setInnerHTML('valueTypeField', json.programIndicator.valueType);
     setInnerHTML('rootDateField', json.programIndicator.rootDate);
     setInnerHTML('expressionField', json.programIndicator.expression);
+    setInnerHTML('idField', json.programIndicator.uid);
 
     showDetails();
   });

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programReminder.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programReminder.js	2014-06-04 11:38:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programReminder.js	2014-06-13 10:58:05 +0000
@@ -50,6 +50,7 @@
 	programId: getFieldValue('programId')
   }, function( json ) {
     setInnerHTML('nameField', json.reminder.name);
+	setInnerHTML('idField', json.reminder.uid);
 	
 	var days = json.reminder.daysAllowedSendMessage;
 	if( eval(days)>=0 ){

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js	2014-04-04 15:35:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js	2014-06-13 10:58:05 +0000
@@ -81,6 +81,7 @@
 		setInnerHTML( 'nameField', json.programStage.name );	
 		setInnerHTML( 'descriptionField', json.programStage.description );
 		setInnerHTML( 'scheduledDaysFromStartField', json.programStage.minDaysFromStart ); 
+		setInnerHTML( 'idField', json.programStage.uid ); 
 		
 		var irregular = (json.programStage.irregular=='true') ? i18n_yes : i18n_no;
 		setInnerHTML( 'irregularField', irregular );  

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStageReminder.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStageReminder.js	2014-06-04 11:38:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStageReminder.js	2014-06-13 10:58:05 +0000
@@ -50,6 +50,7 @@
 	programStageId: getFieldValue('programStageId')
   }, function( json ) {
     setInnerHTML('nameField', json.reminder.name);
+    setInnerHTML('idField', json.reminder.uid);
 	
 	var days = json.reminder.daysAllowedSendMessage;
 	if( eval(days)>=0 ){

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStageSection.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStageSection.js	2014-02-03 04:55:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStageSection.js	2014-06-13 10:58:05 +0000
@@ -20,6 +20,7 @@
 	jQuery.getJSON( 'getProgramStageSection.action', { id: context.id }, function ( json ) {
 		setInnerHTML( 'nameField', json.programStageSection.name );	
 		setInnerHTML( 'dataElementCountField', json.programStageSection.dataElementCount ); 
+		setInnerHTML( 'idField', json.programStageSection.uid ); 
 		showDetails();
 	});
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programValidation.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programValidation.js	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programValidation.js	2014-06-13 10:58:05 +0000
@@ -23,6 +23,7 @@
 function showProgramValidationDetails( context ) {
   jQuery.getJSON('getProgramValidation.action', { validationId: context.id }, function( json ) {
     setInnerHTML('descriptionField', json.validation.description);
+    setInnerHTML('idField', json.validation.uid);
 
     var operator = json.validation.operator;
     setInnerHTML('operatorField', i18nalizeOperator(operator));

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/relationship.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/relationship.js	2013-12-17 01:29:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/relationship.js	2014-06-13 10:58:05 +0000
@@ -18,6 +18,7 @@
     setInnerHTML('aIsToBField', json.relationshipType.aIsToB);
     setInnerHTML('bIsToAField', json.relationshipType.bIsToA);
     setInnerHTML('descriptionField', json.relationshipType.description);
+    setInnerHTML('idField', json.relationshipType.uid);
 
     showDetails();
   });

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/trackedEntity.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/trackedEntity.js	2014-02-17 15:00:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/trackedEntity.js	2014-06-13 10:58:05 +0000
@@ -18,6 +18,7 @@
     function( json ) {
       setInnerHTML('nameField', json.trackedEntity.name);
       setInnerHTML('descriptionField', json.trackedEntity.description);
+      setInnerHTML('idField', json.trackedEntity.uid);
 
       showDetails();
     });

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/validationcriteria.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/validationcriteria.js	2014-06-11 04:53:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/validationcriteria.js	2014-06-13 10:58:05 +0000
@@ -25,6 +25,7 @@
   jQuery.getJSON('getValidationCriteria.action', { id: context.id, programId: getFieldValue('programId')  }, function( json ) {
     setInnerHTML('nameField', json.validationCriteria.name);
     setInnerHTML('descriptionField', json.validationCriteria.description);
+	setInnerHTML('idField', json.validationCriteria.uid);
 
     var property = json.validationCriteria.property;
     var operator = json.validationCriteria.operator;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm	2014-04-29 11:29:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm	2014-06-13 10:58:05 +0000
@@ -58,6 +58,7 @@
 				<p><label class="bold">$i18n.getString( "valueType" ):</label><br><span id="valueTypeField"></span></p>
 				<p><label class="bold">$i18n.getString( "rootDate" ):</label><br><span id="rootDateField"></span></p>
 				<p><label class="bold">$i18n.getString( "expression" ):</label><br><span id="expressionField"></span></p>
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 			</div>
 		</td>
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm	2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm	2014-06-13 10:58:05 +0000
@@ -10,8 +10,8 @@
     <li data-enabled="canUpdate"><a data-target-fn="programStageManagement"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_program_stages" )</a></li>
     <li data-enabled="canManageTemplateMessage"><a data-target-fn="programReminder"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_template_reminder_message" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="validationCriteria"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_validation_criteria" )</a></li>
-    <li data-enabled="canUpdate"><a data-target-fn="programValidationManagement"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "program_validation_rule_management" )</a></li>
-    <li data-enabled="canManageForm"><a data-target-fn="programIndicatorManagementForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "program_indicator_management_form" )</a></li>
+    <li data-enabled="canUpdate"><a data-target-fn="programValidationManagement"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_validation_rule" )</a></li>
+    <li data-enabled="canManageForm"><a data-target-fn="programIndicatorManagementForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_program_indicator" )</a></li>
     <li data-enabled="canManage"><a data-target-fn="showSharingDialogWithContext"><i class="fa fa-share"></i>&nbsp;&nbsp;$i18n.getString( "sharing_settings" )</a></li>
     <li data-enabled="canUpdate"><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>
     <li data-enabled="canDelete"><a data-target-fn="removeProgram"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>
@@ -77,6 +77,7 @@
 				<p><label class="bold">$i18n.getString( "date_of_incident_description" ):</label><br><span id="dateOfIncidentDescriptionField"></span></p>                              
 				<p><label class="bold">$i18n.getString( "date_of_enrollment_description" ):</label><br><span id="dateOfEnrollmentDescriptionField"></span></p>                          
 				<p><label class="bold">$i18n.getString( "number_of_attributes" ):</label><br><span id="noAttributesField"></span></p>
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 			</div>
 
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm	2014-06-04 11:38:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm	2014-06-13 10:58:05 +0000
@@ -55,6 +55,7 @@
 		<p><label class="bold">$i18n.getString( "send_message" ):</label><br><span id="whenToSendField"></span></p>
 		<p><label class="bold">$i18n.getString( "message_type" ):</label><br><span id="messageTypeField"></span></p>
 		<p><label class="bold">$i18n.getString( "user_group" ):</label><br><span id="userGroupField"></span></p>
+		<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 		</div>
 
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm	2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm	2014-06-13 10:58:05 +0000
@@ -6,12 +6,12 @@
   <ul id="contextMenuItems" class="contextMenuItems">
     <li data-enabled="canManageTemplateMessage"><a data-target-fn="programStageReminder"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_template_reminder_message" )</a></li>
     <li><a data-target-fn="showUpdateProgramStageForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
+    <li><a data-target-fn="programStageSectionList"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "section_management" )</a></li>
+    <li><a data-target-fn="viewDataEntryForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "design_data_entry_form" )</a></li>
     <li><a data-target-fn="translateWithContext"><i class="fa fa-globe"></i>&nbsp;&nbsp;$i18n.getString( "translation_translate" )</a></li>
     <li data-enabled="canRemove"><a data-target-fn="removeProgramStage"><i class="fa fa-trash-o"></i>&nbsp;&nbsp;$i18n.getString( "remove" )</a></li>
     <li><a data-target-fn="showProgramStageDetails"><i class="fa fa-info-circle"></i>&nbsp;&nbsp;$i18n.getString( "show_details" )</a></li>
-    <li><a data-target-fn="programStageSectionList"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "section_management" )</a></li>
-    <li><a data-target-fn="viewDataEntryForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "design_data_entry_form" )</a></li>
-  </ul>
+   </ul>
 </div>
 
 <input type='hidden' id='id' name='id' value='$program.id'>
@@ -67,15 +67,16 @@
 				<p><label class="bold">$i18n.getString( "display_generate_event_box_after_completed" ):</label><br><span id="displayGenerateEventBoxField"></span></p>
 				<p><label class="bold">$i18n.getString( "standard_interval_days" ):</label><br><span id="standardIntervalField"></span></p>
 				<p><label class="bold">$i18n.getString( "block_entry_form_after_completed" ):</label><br><span id="blockEntryFormField"></span></p>
-				<p><label class="bold">$i18n.getString( "remind_completing_program_after_program_stage_completed" ):</label><br><span id="remindCompletedField"></span></p>
-				<p><label class="bold">$i18n.getString( "remind_creating_next_event_on_this_event_completed" ):</label><br><span id="allowGenerateNextVisitField"></span></p>
-				<p><label class="bold">$i18n.getString( "generated_events_by_enrollment_date" ):</label><br><span id="generatedByEnrollmentDateField"></span></p>
+				<p><label class="bold">$i18n.getString( "ask_user_to_complete_program_when_stage_complete" ):</label><br><span id="remindCompletedField"></span></p>
+				<p><label class="bold">$i18n.getString( "ask_user_to_create_new_event_when_stage_complete" ):</label><br><span id="allowGenerateNextVisitField"></span></p>
+				<p><label class="bold">$i18n.getString( "generate_events_based_on_enrollment_date" ):</label><br><span id="generatedByEnrollmentDateField"></span></p>
 				<p><label class="bold">$i18n.getString( "capture_coordinates" ):</label><br><span id="captureCoordinatesField"></span></p>
 				<p><label class="bold">$i18n.getString( "complete_allowed_only_if_validation_passes" ):</label><br><span id="validCompleteOnlyField"></span></p>
 				<p><label class="bold">$i18n.getString( "report_date_description" ):</label><br><span id="reportDateDescriptionField"></span></p>
 				<p><label class="bold">$i18n.getString( "open_data_entry_form_after_enrolment" ):</label><br><span id="openAfterEnrollmentField"></span></p>
 				<p><label class="bold">$i18n.getString( "report_date_to_use" ):</label><br><span id="reportDateToUseField"></span></p>
 				<p><label class="bold">$i18n.getString( "no_of_dataelements" ):</label><br><span id="dataElementCountField"></span></p>		
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>		
 			</div>
 		</td>
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageReminder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageReminder.vm	2014-06-04 11:14:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageReminder.vm	2014-06-13 10:58:05 +0000
@@ -45,16 +45,17 @@
       <div id="detailsArea">
         <div id="hideDetailsArea">
           <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
-				</div>
-        <p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
-        <p><label class="bold">$i18n.getString( "send_message" ):</label><br><span id="daysAllowedSendMessageField"></span></p>
-        <p><label class="bold">$i18n.getString( "message" ):</label><br><span id="templateMessageField"></span></p>
-        <p><label class="bold">$i18n.getString( "date_to_compare" ):</label><br><span id="dateToCompareField"></span></p>
-		<p><label class="bold">$i18n.getString( "recipients" ):</label><br><span id="sendToField"></span></p>
-		<p><label class="bold">$i18n.getString( "send_message" ):</label><br><span id="whenToSendField"></span></p>
-		<p><label class="bold">$i18n.getString( "message_type" ):</label><br><span id="messageTypeField"></span></p>
-		<p><label class="bold">$i18n.getString( "user_group" ):</label><br><span id="userGroupField"></span></p>
-		</div>
+			</div>
+				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+				<p><label class="bold">$i18n.getString( "send_message" ):</label><br><span id="daysAllowedSendMessageField"></span></p>
+				<p><label class="bold">$i18n.getString( "message" ):</label><br><span id="templateMessageField"></span></p>
+				<p><label class="bold">$i18n.getString( "date_to_compare" ):</label><br><span id="dateToCompareField"></span></p>
+				<p><label class="bold">$i18n.getString( "recipients" ):</label><br><span id="sendToField"></span></p>
+				<p><label class="bold">$i18n.getString( "send_message" ):</label><br><span id="whenToSendField"></span></p>
+				<p><label class="bold">$i18n.getString( "message_type" ):</label><br><span id="messageTypeField"></span></p>
+				<p><label class="bold">$i18n.getString( "user_group" ):</label><br><span id="userGroupField"></span></p>
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
+			</div>
 
 		</td>
   </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageSection.vm	2014-02-03 04:55:39 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageSection.vm	2014-06-13 10:58:05 +0000
@@ -52,6 +52,7 @@
 				</div>				
 				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
 				<p><label class="bold">$i18n.getString( "no_of_dataelements" ):</label><br><span id="dataElementCountField"></span></p>				
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>				
 			</div>
 		</td>
 	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programValidationList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programValidationList.vm	2014-06-04 09:04:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programValidationList.vm	2014-06-13 10:58:05 +0000
@@ -62,6 +62,7 @@
 				<p><label class="bold">$i18n.getString( "left_side_expression" ):</label><br><span id="leftSideExpressionField"></span></p>
 				<p><label class="bold">$i18n.getString( "right_side_description" ):</label><br><span id="rightSideDescriptionField"></span></p>
 				<p><label class="bold">$i18n.getString( "right_side_expression" ):</label><br><span id="rightSideExpressionField"></span></p>
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
 			</div>
 		</td>
   </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/relationshipType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/relationshipType.vm	2014-04-14 15:59:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/relationshipType.vm	2014-06-13 10:58:05 +0000
@@ -54,11 +54,12 @@
         <div id="detailsArea">
           <div id="hideDetailsArea">
             <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
-          </div>
-          <p><label class="bold">$i18n.getString( "a_is_to_b" ):</label><br><span id="aIsToBField"></span></p>
-          <p><label class="bold">$i18n.getString( "b_is_to_a" ):</label><br><span id="bIsToAField"></span></p>
-          <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
-      </div>
+			  </div>
+				<p><label class="bold">$i18n.getString( "a_is_to_b" ):</label><br><span id="aIsToBField"></span></p>
+				<p><label class="bold">$i18n.getString( "b_is_to_a" ):</label><br><span id="bIsToAField"></span></p>
+				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
+			</div>
     </td>
   </tr>
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/trackedEntity.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/trackedEntity.vm	2014-05-30 08:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/trackedEntity.vm	2014-06-13 10:58:05 +0000
@@ -49,9 +49,11 @@
       <div id="detailsArea">
         <div id="hideDetailsArea">
           <a href="javascript:hideDetails()" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"></a>
-				</div>
-        <p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
-        <p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
+			</div>
+				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
+				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id="idField"></span></p>
+			</div>
 		</td>
   </tr>
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/validationCriteria.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/validationCriteria.vm	2014-06-03 12:38:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/validationCriteria.vm	2014-06-13 10:58:05 +0000
@@ -55,6 +55,7 @@
 				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id='nameField'></span></p>
 				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id='descriptionField'></span></p>
 				<p><label class="bold">$i18n.getString( "criteria" ):</label><br><span id='criteriaField'></span></p>
+				<p><label class="bold">$i18n.getString( "id" ):</label><br><span id='idField'></span></p>
 			</div>
 		</td>
 	</tr>