=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2014-08-05 11:27:57 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2014-08-14 08:16:44 +0000
@@ -28,12 +28,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.common.DxfNamespaces;
 import org.hisp.dhis.common.IdentifiableObject;
@@ -50,12 +50,11 @@
 import org.hisp.dhis.user.UserAuthorityGroup;
 import org.hisp.dhis.validation.ValidationCriteria;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author Abyot Asalefew
@@ -66,11 +65,11 @@
 {
     public static final List<String> TYPE_LOOKUP = Arrays.asList( "", "MULTIPLE_EVENTS_WITH_REGISTRATION",
         "SINGLE_EVENT_WITH_REGISTRATION", "SINGLE_EVENT_WITHOUT_REGISTRATION" );
-    
+
     public static final int MULTIPLE_EVENTS_WITH_REGISTRATION = 1;
     public static final int SINGLE_EVENT_WITH_REGISTRATION = 2;
     public static final int SINGLE_EVENT_WITHOUT_REGISTRATION = 3;
-    
+
     private String description;
 
     private Integer version;
@@ -81,7 +80,7 @@
 
     @Scanned
     private Set<OrganisationUnit> organisationUnits = new HashSet<OrganisationUnit>();
-    
+
     @Scanned
     private List<ProgramStage> programStages = new ArrayList<ProgramStage>();
 
@@ -105,7 +104,7 @@
     private Set<TrackedEntityInstanceReminder> instanceReminders = new HashSet<TrackedEntityInstanceReminder>();
 
     /**
-     * Allow enrolling tracked entity to all org units disregarding whether the 
+     * Allow enrolling tracked entity to all org units disregarding whether the
      * program is assigned for the org unit or not.
      */
     private Boolean displayOnAllOrgunit = true;
@@ -190,7 +189,7 @@
         List<TrackedEntityAttribute> entityAttributes = new ArrayList<TrackedEntityAttribute>();
         for ( ProgramTrackedEntityAttribute programAttribute : programAttributes )
         {
-        	entityAttributes.add( programAttribute.getAttribute() );
+            entityAttributes.add( programAttribute.getAttribute() );
         }
 
         return entityAttributes;
@@ -212,7 +211,7 @@
 
         return null;
     }
-    
+
     public Program increaseVersion()
     {
         version = version != null ? version + 1 : 1;
@@ -530,16 +529,18 @@
     @JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } )
     @JacksonXmlElementWrapper( localName = "programTrackedEntityAttributes", namespace = DxfNamespaces.DXF_2_0 )
     @JacksonXmlProperty( localName = "programTrackedEntityAttribute", namespace = DxfNamespaces.DXF_2_0 )
-    public List<ProgramTrackedEntityAttribute> getProgramAttributes() {
-		return programAttributes;
-	}
-
-	public void setProgramAttributes(
-			List<ProgramTrackedEntityAttribute> programAttributes) {
-		this.programAttributes = programAttributes;
-	}
-
-	@JsonProperty
+    public List<ProgramTrackedEntityAttribute> getProgramAttributes()
+    {
+        return programAttributes;
+    }
+
+    public void setProgramAttributes(
+        List<ProgramTrackedEntityAttribute> programAttributes )
+    {
+        this.programAttributes = programAttributes;
+    }
+
+    @JsonProperty
     @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlElementWrapper( localName = "trackedEntity", namespace = DxfNamespaces.DXF_2_0 )
     @JacksonXmlProperty( localName = "trackedEntity", namespace = DxfNamespaces.DXF_2_0 )