=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java	2014-03-13 15:56:48 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java	2014-03-13 16:17:36 +0000
@@ -101,7 +101,7 @@
 
     private List<Schema> schemas = Lists.newArrayList();
 
-    private List<Attribute> attributeTypes = new ArrayList<Attribute>();
+    private List<Attribute> attributes = new ArrayList<Attribute>();
 
     private List<Document> documents = new ArrayList<Document>();
 
@@ -233,16 +233,16 @@
     }
 
     @JsonProperty
-    @JacksonXmlElementWrapper(localName = "attributeTypes", namespace = DxfNamespaces.DXF_2_0)
-    @JacksonXmlProperty(localName = "attributeType", namespace = DxfNamespaces.DXF_2_0)
-    public List<Attribute> getAttributeTypes()
+    @JacksonXmlElementWrapper(localName = "attributes", namespace = DxfNamespaces.DXF_2_0)
+    @JacksonXmlProperty(localName = "attribute", namespace = DxfNamespaces.DXF_2_0)
+    public List<Attribute> getAttributes()
     {
-        return attributeTypes;
+        return attributes;
     }
 
-    public void setAttributeTypes( List<Attribute> attributeTypes )
+    public void setAttributes( List<Attribute> attributes )
     {
-        this.attributeTypes = attributeTypes;
+        this.attributes = attributes;
     }
 
     @JsonProperty
@@ -900,7 +900,7 @@
     {
         return "MetaData{" +
             "created=" + created +
-            ", attributeTypes=" + attributeTypes +
+            ", attributes=" + attributes +
             ", documents=" + documents +
             ", constants=" + constants +
             ", concepts=" + concepts +

=== added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AttributeController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AttributeController.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AttributeController.java	2014-03-13 16:17:36 +0000
@@ -0,0 +1,44 @@
+package org.hisp.dhis.api.controller;
+
+/*
+ * Copyright (c) 2004-2013, 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 org.hisp.dhis.attribute.Attribute;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@gmail.com>
+ */
+@Controller
+@RequestMapping( value = AttributeController.RESOURCE_PATH )
+public class AttributeController
+    extends AbstractCrudController<Attribute>
+{
+    public static final String RESOURCE_PATH = "/attributes";
+}

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl	2013-09-09 12:45:37 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl	2014-03-13 16:17:36 +0000
@@ -16,7 +16,7 @@
       d:categoryOptions|d:categoryOptionCombos|d:dataElements|d:indicators|
       d:organisationUnits|d:dataElementGroups|d:dataElementGroupSets|d:dataSets|
       d:documents|d:indicatorGroups|d:indicatorGroupSets|d:organisationUnitGroups|
-      d:organisationUnitGroupSets|d:indicatorTypes|d:attributeTypes|d:reports|d:constants|
+      d:organisationUnitGroupSets|d:indicatorTypes|d:attributes|d:reports|d:constants|
       d:sqlViews|d:validationRules|d:validationRuleGroups|d:users|d:userGroups|d:userAuthorityGroups|
       d:reportTables|d:mapLegends|d:mapLegendSets|d:mapLayers|d:optionSets|d:interpretations|
       d:sections|d:userRoles|d:organisationUnitLevels|d:programs|d:programStages|d:dimensions|d:dashboards">

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataExport.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataExport.vm	2013-09-01 20:44:11 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataExport.vm	2014-03-13 16:17:36 +0000
@@ -89,7 +89,7 @@
 <input id="mapLegends" name="mapLegends" type="checkbox" value="true" style="display: none;" />
 
 <fieldset style="width: 80%; border: 1px solid #ccc; padding: 15px;">
-    <div style="width: 200px; float: left;"><input id="attributeTypes" name="attributeTypes" type="checkbox" value="true" /> <label for="attributeTypes"> Attribute Types</label></div>
+    <div style="width: 200px; float: left;"><input id="attributes" name="attributes" type="checkbox" value="true" /> <label for="attributes"> Attribute Types</label></div>
     <div style="width: 200px; float: left;"><input id="categories" name="categories" type="checkbox" value="true" /> <label for="categories">Categories</label></div>
     <div style="width: 200px; float: left;"><input id="charts" name="charts" type="checkbox" value="true" /> <label for="charts">Charts</label></div>
     <div style="width: 200px; float: left;"><input id="concepts" name="concepts" type="checkbox" value="true" /> <label for="concepts">Concepts</label></div>