=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java	2014-01-02 13:13:21 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java	2014-02-10 11:32:58 +0000
@@ -62,7 +62,7 @@
      */
     private DataElement dataElement;
 
-    /*
+    /**
      * True if this dataElement is mandatory in the dataEntryForm for this
      * programStage
      */

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java	2014-02-09 13:16:17 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java	2014-02-10 11:32:58 +0000
@@ -767,9 +767,6 @@
         List<TrackedEntityAttributeValue> atts = new ArrayList<TrackedEntityAttributeValue>(
             patient.getAttributeValues() );
 
-        Set<TrackedEntityAttribute> displayAttributes = new HashSet<TrackedEntityAttribute>(
-            attributeService.getTrackedEntityAttributesDisplayedInList( true ) );
-
         for ( TrackedEntityAttributeValue value : atts )
         {
             if ( value != null )
@@ -777,10 +774,7 @@
                 org.hisp.dhis.api.mobile.model.PatientAttribute patientAttribute = new org.hisp.dhis.api.mobile.model.PatientAttribute(
                     value.getAttribute().getName(), value.getValue(), value.getAttribute().getValueType(), false,
                     new ArrayList<String>() );
-                // if ( displayAttributes.contains( value.getAttribute() ) )
-                // {
-                // patientAttribute.setDisplayedInList( true );
-                // }
+                
                 patientAtts.add( patientAttribute );
             }
         }

=== removed file 'dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/package-info.java'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/package-info.java	2014-01-16 15:26:39 +0000
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/package-info.java	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-/**
- * @author Morten Olav Hansen <mortenoh@gmail.com>
- */
-@XmlSchema( xmlns = {
-    @XmlNs( prefix = "soap", namespaceURI = "http://www.w3.org/2003/05/soap-envelope" ),
-    @XmlNs( prefix = "wsa", namespaceURI = "http://www.w3.org/2005/08/addressing" ),
-    @XmlNs( prefix = "csd", namespaceURI = "urn:ihe:iti:csd:2013" )
-} )
-package org.hisp.dhis.web.ohie.common.domain.soap;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;