=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramSchemaDescriptor.java	2015-07-14 07:21:33 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramSchemaDescriptor.java	2015-10-07 02:50:55 +0000
@@ -54,7 +54,7 @@
         Schema schema = new Schema( Program.class, SINGULAR, PLURAL );
         schema.setRelativeApiEndpoint( API_ENDPOINT );
         schema.setShareable( true );
-        schema.setOrder( 1520 );
+        schema.setOrder( 1508 );
 
         schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PUBLIC, Lists.newArrayList( "F_PROGRAM_PUBLIC_ADD" ) ) );
         schema.getAuthorities().add( new Authority( AuthorityType.CREATE_PRIVATE, Lists.newArrayList( "F_PROGRAM_PRIVATE_ADD" ) ) );

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageDataElementSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageDataElementSchemaDescriptor.java	2015-07-14 07:21:33 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageDataElementSchemaDescriptor.java	2015-10-07 02:50:55 +0000
@@ -53,7 +53,7 @@
     {
         Schema schema = new Schema( ProgramStageDataElement.class, SINGULAR, PLURAL );
         schema.setRelativeApiEndpoint( API_ENDPOINT );
-        schema.setOrder( 1509 );
+        schema.setOrder( 1510 );
 
         schema.getAuthorities().add( new Authority( AuthorityType.CREATE, Lists.newArrayList( "F_PROGRAMSTAGE_ADD" ) ) );
         schema.getAuthorities().add( new Authority( AuthorityType.DELETE, Lists.newArrayList( "F_PROGRAMSTAGE_DELETE" ) ) );

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSectionSchemaDescriptor.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSectionSchemaDescriptor.java	2015-10-06 09:48:13 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSectionSchemaDescriptor.java	2015-10-07 02:50:55 +0000
@@ -50,7 +50,7 @@
     {
         Schema schema = new Schema( ProgramStageSection.class, SINGULAR, PLURAL );
         schema.setRelativeApiEndpoint( API_ENDPOINT );
-        schema.setOrder( 1510 );
+        schema.setOrder( 1509 );
 
         return schema;
     }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java	2015-06-23 15:59:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java	2015-10-07 02:50:55 +0000
@@ -28,12 +28,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Iterator;
-
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementDomain;
 import org.hisp.dhis.system.deletion.DeletionHandler;
 
+import java.util.Iterator;
+
 /**
  * @author Chau Thu Tran
  */
@@ -44,11 +44,11 @@
     // Dependencies
     // -------------------------------------------------------------------------
 
-    private ProgramStageDataElementService programStageDEService;
+    private ProgramStageDataElementService programStageDataElementService;
 
-    public void setProgramStageDEService( ProgramStageDataElementService programStageDEService )
+    public void setProgramStageDataElementService( ProgramStageDataElementService programStageDEService )
     {
-        this.programStageDEService = programStageDEService;
+        this.programStageDataElementService = programStageDEService;
     }
 
     // -------------------------------------------------------------------------
@@ -69,16 +69,16 @@
         while ( iterator.hasNext() )
         {
             ProgramStageDataElement de = iterator.next();
-            programStageDEService.deleteProgramStageDataElement( de );
+            programStageDataElementService.deleteProgramStageDataElement( de );
         }
     }
 
     @Override
     public void deleteDataElement( DataElement dataElement )
     {
-        if ( DataElementDomain.TRACKER.equals( dataElement.getDomainType() ) )
+        if ( DataElementDomain.TRACKER == dataElement.getDomainType() )
         {
-            Iterator<ProgramStageDataElement> iterator = programStageDEService.getAllProgramStageDataElements().iterator();
+            Iterator<ProgramStageDataElement> iterator = programStageDataElementService.getAllProgramStageDataElements().iterator();
 
             while ( iterator.hasNext() )
             {
@@ -86,7 +86,7 @@
 
                 if ( element.getDataElement() != null && element.getDataElement().equals( dataElement ) )
                 {
-                    programStageDEService.deleteProgramStageDataElement( element );
+                    programStageDataElementService.deleteProgramStageDataElement( element );
                 }
             }
         }

=== 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	2015-10-02 08:28:58 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2015-10-07 02:50:55 +0000
@@ -579,8 +579,8 @@
   </bean>
 
   <bean id="org.hisp.dhis.keyjsonvalue.KeyJsonValueStore" class="org.hisp.dhis.keyjsonvalue.hibernate.HibernateKeyJsonValueStore">
-      <property name="clazz" value="org.hisp.dhis.keyjsonvalue.KeyJsonValue" />
-      <property name="sessionFactory" ref="sessionFactory" />
+    <property name="clazz" value="org.hisp.dhis.keyjsonvalue.KeyJsonValue" />
+    <property name="sessionFactory" ref="sessionFactory" />
   </bean>
 
   <!-- Service definitions -->
@@ -1246,7 +1246,7 @@
   </bean>
 
   <bean id="org.hisp.dhis.keyjsonvalue.KeyJsonValueService" class="org.hisp.dhis.keyjsonvalue.DefaultKeyJsonValueService">
-      <property name="keyJsonValueStore" ref="org.hisp.dhis.keyjsonvalue.KeyJsonValueStore" />
+    <property name="keyJsonValueStore" ref="org.hisp.dhis.keyjsonvalue.KeyJsonValueStore" />
   </bean>
 
   <!-- SMS services -->
@@ -1634,7 +1634,7 @@
 
   <bean id="org.hisp.dhis.program.ProgramStageDataElementDeletionHandler"
     class="org.hisp.dhis.program.ProgramStageDataElementDeletionHandler">
-    <property name="programStageDEService" ref="org.hisp.dhis.program.ProgramStageDataElementService" />
+    <property name="programStageDataElementService" ref="org.hisp.dhis.program.ProgramStageDataElementService" />
   </bean>
 
   <bean id="org.hisp.dhis.program.ProgramStageDeletionHandler"

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml	2015-10-01 18:17:35 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml	2015-10-07 02:50:55 +0000
@@ -13,18 +13,16 @@
     <id name="id" column="programstageid">
       <generator class="native" />
     </id>
-
     &identifiableProperties;
 
     <property name="name" column="name" length="230" />
 
     <property name="description" type="text" />
 
-    <property name="minDaysFromStart" column="mindaysfromstart"
-      not-null="true" />
+    <property name="minDaysFromStart" column="mindaysfromstart" not-null="true" />
 
-    <many-to-one name="program" class="org.hisp.dhis.program.Program"
-      column="programid" foreign-key="fk_programstage_program" />
+    <many-to-one name="program" class="org.hisp.dhis.program.Program" column="programid"
+      foreign-key="fk_programstage_program" />
 
     <property name="irregular" column="irregular" />
 
@@ -45,8 +43,7 @@
 
     <property name="excecutionDateLabel" />
 
-    <set name="reminders" order-by="daysAllowedSendMessage"
-      cascade="all">
+    <set name="reminders" order-by="daysAllowedSendMessage" cascade="all">
       <key column="programStageid" />
       <one-to-many class="org.hisp.dhis.trackedentity.TrackedEntityInstanceReminder" />
     </set>