=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/comparator/TrackedEntityAttributeValueSortOrderComparator.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/comparator/TrackedEntityAttributeValueSortOrderComparator.java	2015-01-28 10:50:56 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/comparator/TrackedEntityAttributeValueSortOrderComparator.java	2015-02-03 14:32:52 +0000
@@ -1,29 +1,57 @@
 package org.hisp.dhis.api.mobile.model.comparator;
 
+/*
+ * Copyright (c) 2004-2015, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 import java.util.Comparator;
 
 import org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValue;
 
-public class TrackedEntityAttributeValueSortOrderComparator implements Comparator<TrackedEntityAttributeValue>
+public class TrackedEntityAttributeValueSortOrderComparator
+    implements Comparator<TrackedEntityAttributeValue>
 {
-
-        public int compare( TrackedEntityAttributeValue value0, TrackedEntityAttributeValue value1 )
-        {
-            if ( value0 == null || value1 == null || value0.getAttribute() == null || value1.getAttribute() == null )
-            {
-                return 0;
-            }
-            if ( value0.getAttribute().getSortOrderInListNoProgram() == null || value0.getAttribute().getSortOrderInListNoProgram() == 0 )
-            {
-                return value0.getAttribute().getName().compareTo( value1.getAttribute().getName() );
-            }
-
-            if ( value1.getAttribute().getSortOrderInListNoProgram() == null || value1.getAttribute().getSortOrderInListNoProgram() == 0 )
-            {
-                return value0.getAttribute().getName().compareTo( value1.getAttribute().getName() );
-            }
-
-            return value0.getAttribute().getSortOrderInListNoProgram() - value1.getAttribute().getSortOrderInListNoProgram();
-        }
-
+    public int compare( TrackedEntityAttributeValue value0, TrackedEntityAttributeValue value1 )
+    {
+        if ( value0 == null || value1 == null || value0.getAttribute() == null || value1.getAttribute() == null )
+        {
+            return 0;
+        }
+        
+        if ( value0.getAttribute().getSortOrderInListNoProgram() == null || value0.getAttribute().getSortOrderInListNoProgram() == 0 )
+        {
+            return value0.getAttribute().getName().compareTo( value1.getAttribute().getName() );
+        }
+
+        if ( value1.getAttribute().getSortOrderInListNoProgram() == null || value1.getAttribute().getSortOrderInListNoProgram() == 0 )
+        {
+            return value0.getAttribute().getName().compareTo( value1.getAttribute().getName() );
+        }
+
+        return value0.getAttribute().getSortOrderInListNoProgram() - value1.getAttribute().getSortOrderInListNoProgram();
+    }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/LocaleUtil.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/LocaleUtil.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/LocaleUtil.java	2015-02-03 14:32:52 +0000
@@ -32,7 +32,6 @@
 
 public class LocaleUtil
 {
-
     public static Locale getLocale( String localeString )
     {
         Locale locale;