=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2013-05-23 00:18:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2013-05-27 08:39:36 +0000
@@ -244,6 +244,7 @@
   </bean>
 
   <bean id="org.hisp.dhis.user.UserAuthorityGroupStore" class="org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore">
+    <property name="cacheable" value="true" />
     <property name="clazz" value="org.hisp.dhis.user.UserAuthorityGroup" />
     <property name="sessionFactory" ref="sessionFactory" />
   </bean>

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml	2013-02-07 10:25:34 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml	2013-05-27 08:39:36 +0000
@@ -23,6 +23,7 @@
     </set>
 
     <set name="authorities" table="userroleauthorities">
+      <cache usage="read-write" />
       <key column="userroleid" foreign-key="fk_userroleauthorities_userroleid" />
       <element type="string" column="authority" />
     </set>

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml	2013-05-10 16:29:19 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml	2013-05-27 08:39:36 +0000
@@ -64,13 +64,11 @@
 
   <cache name="org.hisp.dhis.user.User" maxElementsInMemory="200" />
 
-  <cache name="org.hisp.dhis.user.User.attributeValues" maxElementsInMemory="1000" />
-
   <cache name="org.hisp.dhis.user.UserSetting" maxElementsInMemory="200" />
 
   <cache name="org.hisp.dhis.user.UserCredentials" maxElementsInMemory="200" />
 
-  <cache name="org.hisp.dhis.user.UserCredentials.userAuthorityGroups" maxElementsInMemory="200" />
+  <cache name="org.hisp.dhis.user.UserAuthorityGroup" maxElementsInMemory="200" />
 
   <cache name="org.hisp.dhis.setting.SystemSetting" maxElementsInMemory="200" />
 
@@ -166,42 +164,62 @@
 
   <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet.organisationUnitGroups" maxElementsInMemory="500" />
 
+  <cache name="org.hisp.dhis.reporttable.ReportTable.indicators" maxElementsInMemory="500" />
+
   <cache name="org.hisp.dhis.reporttable.ReportTable.dataElements" maxElementsInMemory="1500" />
 
-  <cache name="org.hisp.dhis.reporttable.ReportTable.indicators" maxElementsInMemory="500" />
+  <cache name="org.hisp.dhis.reporttable.ReportTable.dataElementOperands" maxElementsInMemory="1500" />
 
   <cache name="org.hisp.dhis.reporttable.ReportTable.dataSets" maxElementsInMemory="200" />
 
   <cache name="org.hisp.dhis.reporttable.ReportTable.periods" maxElementsInMemory="200" />
 
-  <cache name="org.hisp.dhis.reporttable.ReportTable.units" maxElementsInMemory="2000" />
+  <cache name="org.hisp.dhis.reporttable.ReportTable.organisationUnits" maxElementsInMemory="2000" />
   
+  <cache name="org.hisp.dhis.reporttable.ReportTable.dataElementGroups" maxElementsInMemory="500" />
+
   <cache name="org.hisp.dhis.reporttable.ReportTable.organisationUnitGroups" maxElementsInMemory="500" />
 
-  <cache name="org.hisp.dhis.chart.Chart.dataElements" maxElementsInMemory="2000" />
+  <cache name="org.hisp.dhis.reporttable.ReportTable.categoryDimensions" maxElementsInMemory="500" />
+
+  <cache name="org.hisp.dhis.reporttable.ReportTable.columnDimensions" maxElementsInMemory="500" />
+
+  <cache name="org.hisp.dhis.reporttable.ReportTable.rowDimensions" maxElementsInMemory="500" />
+
+  <cache name="org.hisp.dhis.reporttable.ReportTable.filterDimensions" maxElementsInMemory="500" />
+
+  <cache name="org.hisp.dhis.chart.Chart.indicators" maxElementsInMemory="500" />
+
+  <cache name="org.hisp.dhis.chart.Chart.dataElements" maxElementsInMemory="1500" />
   
-  <cache name="org.hisp.dhis.chart.Chart.dataElementOperands" maxElementsInMemory="2000" />
+  <cache name="org.hisp.dhis.chart.Chart.dataElementOperands" maxElementsInMemory="1500" />
 
-  <cache name="org.hisp.dhis.chart.Chart.indicators" maxElementsInMemory="2000" />
+  <cache name="org.hisp.dhis.chart.Chart.dataSets" maxElementsInMemory="200" />
 
   <cache name="org.hisp.dhis.chart.Chart.periods" maxElementsInMemory="200" />
 
   <cache name="org.hisp.dhis.chart.Chart.organisationUnits" maxElementsInMemory="2000" />
   
-  <cache name="org.hisp.dhis.chart.Chart.dataElementGroups" maxElementsInMemory="2000" />
-  
-  <cache name="org.hisp.dhis.chart.Chart.categoryDimensions" maxElementsInMemory="2000" />
-  
-  <cache name="org.hisp.dhis.chart.Chart.organisationUnitGroups" maxElementsInMemory="2000" />
-  
-  <cache name="org.hisp.dhis.chart.Chart.dataSets" maxElementsInMemory="200" />
-
+  <cache name="org.hisp.dhis.chart.Chart.dataElementGroups" maxElementsInMemory="500" />
+  
+  <cache name="org.hisp.dhis.chart.Chart.organisationUnitGroups" maxElementsInMemory="500" />
+  
+  <cache name="org.hisp.dhis.chart.Chart.categoryDimensions" maxElementsInMemory="500" />
+  
+  <cache name="org.hisp.dhis.chart.Chart.filterDimensions" maxElementsInMemory="500" />
+  
   <cache name="org.hisp.dhis.mapping.Map.mapViews" maxElementsInMemory="1000" />
 
-  <cache name="org.hisp.dhis.user.User.organisationUnits" maxElementsInMemory="20000" />
-
   <cache name="org.hisp.dhis.attribute.Attribute.attributeValues" maxElementsInMemory="5000" />
   
   <cache name="org.hisp.dhis.option.OptionSet.options" maxElementsInMemory="2000" />
 
+  <cache name="org.hisp.dhis.user.User.organisationUnits" maxElementsInMemory="20000" />
+
+  <cache name="org.hisp.dhis.user.User.attributeValues" maxElementsInMemory="1000" />
+
+  <cache name="org.hisp.dhis.user.UserCredentials.userAuthorityGroups" maxElementsInMemory="200" />
+
+  <cache name="org.hisp.dhis.user.UserAuthorityGroup.authorities" maxElementsInMemory="500" />
+
 </ehcache>

=== 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	2012-10-19 10:20:05 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-05-27 08:39:36 +0000
@@ -209,7 +209,7 @@
 div#menuDropDown4
 {
   position: absolute;
-  top: 44px;
+  top: 46px;
   left: 780px;
 }