=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2013-05-25 12:22:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2013-07-04 16:05:38 +0000
@@ -76,6 +76,7 @@
     public static final String KEY_USER_ORGUNIT = "USER_ORGUNIT";
     public static final String KEY_USER_ORGUNIT_CHILDREN = "USER_ORGUNIT_CHILDREN";
     public static final String KEY_LEVEL = "LEVEL-";
+    public static final String KEY_ORGUNIT_GROUP = "OU_GROUP-";
 
     private static final List<String> FEATURETYPES = Arrays.asList( FEATURETYPE_NONE, FEATURETYPE_MULTIPOLYGON, FEATURETYPE_POLYGON, FEATURETYPE_POINT );
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-07-03 17:47:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-07-04 16:05:38 +0000
@@ -236,7 +236,7 @@
 {
   list-style-type: none;
   padding: 0;
-  margin: 0 20px 0 20px;
+  margin: 0 13px;
 }
 
 #leftBarContents ul a
@@ -244,8 +244,7 @@
   display: block;
   color: #303030;
   text-decoration: none;
-  padding-top: 8px;
-  padding-bottom: 8px;
+  padding: 8px 7px;
   cursor: pointer;
   border-bottom: 1px solid #e8e8e8;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-07-03 17:47:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-07-04 16:05:38 +0000
@@ -236,7 +236,7 @@
 {
   list-style-type: none;
   padding: 0;
-  margin: 0 20px 0 20px;
+  margin: 0 13px;
 }
 
 #leftBarContents ul a
@@ -244,8 +244,7 @@
   display: block;
   color: #303030;
   text-decoration: none;
-  padding-top: 8px;
-  padding-bottom: 8px;
+  padding: 8px 7px;
   cursor: pointer;
   border-bottom: 1px solid #e8e8e8;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-07-03 17:47:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-07-04 16:05:38 +0000
@@ -236,7 +236,7 @@
 {
   list-style-type: none;
   padding: 0;
-  margin: 0 20px 0 20px;
+  margin: 0 13px;
 }
 
 #leftBarContents ul a
@@ -244,8 +244,7 @@
   display: block;
   color: #303030;
   text-decoration: none;
-  padding-top: 8px;
-  padding-bottom: 8px;
+  padding: 8px 7px;
   cursor: pointer;
   border-bottom: 1px solid #e8e8e8;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-07-03 17:47:01 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-07-04 16:05:38 +0000
@@ -236,7 +236,7 @@
 {
   list-style-type: none;
   padding: 0;
-  margin: 0 20px 0 20px;
+  margin: 0 13px;
 }
 
 #leftBarContents ul a
@@ -244,8 +244,7 @@
   display: block;
   color: #303030;
   text-decoration: none;
-  padding-top: 8px;
-  padding-bottom: 8px;
+  padding: 8px 7px;
   cursor: pointer;
   border-bottom: 1px solid #e8e8e8;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2013-07-03 15:17:31 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2013-07-04 16:05:38 +0000
@@ -18,7 +18,7 @@
 #contentDiv
 {
   position: relative;
-  top: 44px;
+  top: 46px;
 }
 
 .removeIcon