=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml	2014-07-27 15:02:58 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml	2014-08-14 09:06:03 +0000
@@ -8,100 +8,100 @@
 <hibernate-mapping>
   <class name="org.hisp.dhis.program.Program" table="program">
 
-	<cache usage="read-write" />
+    <cache usage="read-write" />
 
-	<id name="id" column="programid">
-		<generator class="native" />
-	</id>
+    <id name="id" column="programid">
+      <generator class="native" />
+    </id>
     &identifiableProperties;
 
-	<property name="name" column="name" not-null="true" length="230" />
-
-	<property name="description" type="text" />
-
-	<property name="version" />
-
-	<property name="dateOfEnrollmentDescription" type="text" />
-
-	<property name="dateOfIncidentDescription" type="text" />
-
-	<list name="programStages">
+    <property name="name" column="name" not-null="true" length="230" />
+
+    <property name="description" type="text" />
+
+    <property name="version" />
+
+    <property name="dateOfEnrollmentDescription" type="text" />
+
+    <property name="dateOfIncidentDescription" type="text" />
+
+    <list name="programStages">
       <key column="programid" />
       <list-index column="sort_order" base="1" />
       <one-to-many class="org.hisp.dhis.program.ProgramStage" />
     </list>
 
-	<set name="organisationUnits" table="program_organisationunits">
-		<key column="programid" foreign-key="fk_program_organisationunits_programid" />
-		<many-to-many column="organisationunitid"
-			class="org.hisp.dhis.organisationunit.OrganisationUnit" foreign-key="fk_program_organisationunits_organisationunitid" />
-	</set>
-
-	<set name="validationCriteria" table="program_criteria">
-		<key column="programid" foreign-key="fk_program_criteria_programid" />
-		<many-to-many column="validationcriteriaid"
-			class="org.hisp.dhis.validation.ValidationCriteria" foreign-key="fk_program_criteria_validationcriteriaid" />
-	</set>
-
-	<property name="type" />
-
-	<property name="displayIncidentDate" />
-
-	<property name="onlyEnrollOnce" />
-
-	<list name="programAttributes" cascade="all,delete-orphan">
+    <set name="organisationUnits" table="program_organisationunits">
+      <key column="programid" foreign-key="fk_program_organisationunits_programid" />
+      <many-to-many column="organisationunitid"
+        class="org.hisp.dhis.organisationunit.OrganisationUnit" foreign-key="fk_program_organisationunits_organisationunitid" />
+    </set>
+
+    <set name="validationCriteria" table="program_criteria">
+      <key column="programid" foreign-key="fk_program_criteria_programid" />
+      <many-to-many column="validationcriteriaid"
+        class="org.hisp.dhis.validation.ValidationCriteria" foreign-key="fk_program_criteria_validationcriteriaid" />
+    </set>
+
+    <property name="type" />
+
+    <property name="displayIncidentDate" />
+
+    <property name="onlyEnrollOnce" />
+
+    <list name="programAttributes" cascade="all,delete-orphan">
       <key column="programid" />
       <list-index column="sort_order" base="1" />
       <one-to-many class="org.hisp.dhis.program.ProgramTrackedEntityAttribute" />
     </list>
-    
-	<property name="ignoreOverdueEvents" />
-
-	<set name="userRoles" table="program_userroles">
-		<key column="programid" />
-		<many-to-many class="org.hisp.dhis.user.UserAuthorityGroup"
-			column="userroleid" foreign-key="fk_program_userroles" />
-	</set>
-
-	<set name="instanceReminders" order-by="daysAllowedSendMessage"
-		cascade="all">
-		<key column="programid" />
-		<one-to-many class="org.hisp.dhis.trackedentity.TrackedEntityInstanceReminder" />
-	</set>
-
-	<property name="displayOnAllOrgunit" />
-
-	<property name="selectEnrollmentDatesInFuture" />
-
-	<property name="selectIncidentDatesInFuture" />
-
-	<property name="relationshipText" />
-
-	<many-to-one name="relationshipType" class="org.hisp.dhis.relationship.RelationshipType" 
-	   column="relationshiptypeid" foreign-key="fk_program_relationshipid" />
-
-	<property name="relationshipFromA" />
-
-	<many-to-one name="relatedProgram" class="org.hisp.dhis.program.Program"
-	   column="relatedprogramid" foreign-key="fk_program_relatedprogram" />
-
-	<property name="dataEntryMethod" />
-	
-	<many-to-one name="trackedEntity" class="org.hisp.dhis.trackedentity.TrackedEntity" 
-	   column="trackedentityid" foreign-key="fk_program_trackedentityid" />
-
-	<!-- Access properties -->
-
-	<many-to-one name="user" class="org.hisp.dhis.user.User"
-		column="userid" foreign-key="fk_program_userid" />
-
-	<property name="publicAccess" length="8" />
-
-	<set name="userGroupAccesses" table="programusergroupaccesses">
-		<key column="programid" />
-		<many-to-many class="org.hisp.dhis.user.UserGroupAccess"
-			column="usergroupaccessid" unique="true" />
-	</set>
+
+    <property name="ignoreOverdueEvents" />
+
+    <set name="userRoles" table="program_userroles">
+      <key column="programid" />
+      <many-to-many class="org.hisp.dhis.user.UserAuthorityGroup"
+        column="userroleid" foreign-key="fk_program_userroles" />
+    </set>
+
+    <set name="instanceReminders" order-by="daysAllowedSendMessage"
+      cascade="all">
+      <key column="programid" />
+      <one-to-many class="org.hisp.dhis.trackedentity.TrackedEntityInstanceReminder" />
+    </set>
+
+    <property name="displayOnAllOrgunit" />
+
+    <property name="selectEnrollmentDatesInFuture" />
+
+    <property name="selectIncidentDatesInFuture" />
+
+    <property name="relationshipText" />
+
+    <many-to-one name="relationshipType" class="org.hisp.dhis.relationship.RelationshipType"
+      column="relationshiptypeid" foreign-key="fk_program_relationshipid" />
+
+    <property name="relationshipFromA" />
+
+    <many-to-one name="relatedProgram" class="org.hisp.dhis.program.Program"
+      column="relatedprogramid" foreign-key="fk_program_relatedprogram" />
+
+    <property name="dataEntryMethod" />
+
+    <many-to-one name="trackedEntity" class="org.hisp.dhis.trackedentity.TrackedEntity"
+      column="trackedentityid" foreign-key="fk_program_trackedentityid" />
+
+    <!-- Access properties -->
+
+    <many-to-one name="user" class="org.hisp.dhis.user.User"
+      column="userid" foreign-key="fk_program_userid" />
+
+    <property name="publicAccess" length="8" />
+
+    <set name="userGroupAccesses" table="programusergroupaccesses">
+      <key column="programid" />
+      <many-to-many class="org.hisp.dhis.user.UserGroupAccess"
+        column="usergroupaccessid" unique="true" />
+    </set>
 
   </class>
 </hibernate-mapping>