=== modified file 'dhis-2/dhis-services/pom.xml'
--- dhis-2/dhis-services/pom.xml	2015-10-20 22:50:17 +0000
+++ dhis-2/dhis-services/pom.xml	2015-12-21 21:55:16 +0000
@@ -22,10 +22,10 @@
     <!-- Level 1 -->
     <module>dhis-service-core</module>
     <!-- Level 2 -->
-    <module>dhis-service-administration</module>
     <module>dhis-service-dxf2</module>
     <module>dhis-service-mobile</module>
     <!-- Level 3 -->
+    <module>dhis-service-administration</module>
     <module>dhis-service-analytics</module>
     <!-- Level 4 -->
     <module>dhis-service-eventreporting</module>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/ShowAddOptionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/ShowAddOptionAction.java	2015-12-17 13:36:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/ShowAddOptionAction.java	2015-12-21 21:55:16 +0000
@@ -39,9 +39,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>
@@ -68,8 +66,6 @@
 
     private List<Attribute> attributes;
 
-    private Map<Integer, String> attributeValues = new HashMap<>();
-
     // -------------------------------------------------------------------------------------------------
     // Getters && Setters
     // -------------------------------------------------------------------------------------------------