=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2014-05-18 00:49:40 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2014-05-23 18:02:29 +0000
@@ -962,6 +962,7 @@
         <value>usergroup</value>
         <value>userrole</value>
         <value>optionset</value>
+        <value>validationcriteria</value>
       </list>
     </property>
   </bean>

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationCriteria.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationCriteria.hbm.xml	2014-05-23 17:58:34 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationCriteria.hbm.xml	2014-05-23 18:02:29 +0000
@@ -12,6 +12,8 @@
       <generator class="native" />
     </id>
     &identifiableProperties;
+    
+    <property name="name" column="name" not-null="true" unique="true" length="230" />
 
     <property name="description" />
 

=== 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	2014-05-23 17:58:34 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/META-INF/dhis/beans.xml	2014-05-23 18:02:29 +0000
@@ -376,7 +376,6 @@
 				<value>relationshiptype</value>
 				<value>programstagesection</value>
 				<value>programvalidation</value>
-				<value>validationcriteria</value>
 			</list>
 		</property>
 	</bean>