=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java	2013-02-28 15:20:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java	2013-03-01 08:36:06 +0000
@@ -91,12 +91,6 @@
     // Logic
     // -------------------------------------------------------------------------
 
-    @Override
-    public String getShortName()
-    {
-        return name;
-    }
-
     public void addOrganisationUnit( OrganisationUnit organisationUnit )
     {
         members.add( organisationUnit );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegend.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegend.hbm.xml	2012-12-13 11:53:32 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegend.hbm.xml	2013-03-01 08:36:06 +0000
@@ -12,7 +12,7 @@
       <generator class="native" />
     </id>
 
-    <property name="name" column="name" not-null="true" length="230" />
+    <property name="name" column="name" not-null="true" unique="false" length="230" />
 
     <property name="uid" column="uid" length="11" />
 

=== renamed file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/userGroupAccess.hbm.xml' => 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroupAccess.hbm.xml'