=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml	2015-03-29 06:45:47 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml	2015-05-06 08:49:10 +0000
@@ -421,6 +421,9 @@
 				<value>relationshiptype</value>
 				<value>programstagesection</value>
 				<value>programvalidation</value>
+				<value>programrule</value>
+				<value>programruleaction</value>
+				<value>programrulevariable</value>
 			</list>
 		</property>
 	</bean>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js	2015-01-20 19:24:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js	2015-05-06 08:49:10 +0000
@@ -117,6 +117,9 @@
   }
 };
 
+/**
+ * Generates a valid UUID.
+ */
 dhis2.util.uuid = function() {
   var S4 = function() {
     return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
@@ -125,7 +128,9 @@
   return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
 };
 
-
+/**
+ * Generates a valid UID.
+ */
 dhis2.util.uid = function() {
   var letters = "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
   var allowedChars = "0123456789" + letters;
@@ -143,7 +148,6 @@
   return uid;
 };
 
-
 /**
  * Normalizes an argument object returned from a jQuery promise. If the argument
  * is undefined, not an array or an empty array, undefined is returned. If the