=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2014-12-15 14:00:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2014-12-17 14:17:16 +0000
@@ -55,7 +55,7 @@
 dhis-web-event-reports=Event Reports
 dhis-web-event-visualizer=Event Visualizer
 dhis-web-tracker-capture=Tracker Capture
-dhis-web-cache-cleaner=Cache Cleaner
+dhis-web-cache-cleaner=Browser Cache Cleaner
 dhis-web-reporting=Reports
 dhis-web-light=Mobile (Light)
 dhis-web-mobile=Mobile (Smartphone)

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/i18n/i18n_app.properties	2014-12-15 15:24:52 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/i18n/i18n_app.properties	2014-12-17 14:17:16 +0000
@@ -14,12 +14,10 @@
 clearing_dhis2_browser_cache=DHIS2 related browser cache cleaner
 clears_local_cache=This clears selected items from your browser cache
 proceed_cleaning=Are your sure you want to proceed with the cleaning?
-cache_empty=Browser cache is empty. Nothing to clear.
+cache_cleared=Browser cache is cleared.
+nothing_to_clear=Browser cache is empty. Nothing to clear.
 clearing_cache=Clearing cache
 proceed=Proceed
 select_all=Select all
 cancel=Cancel
-clear=Clear
-
-
-
+clear=Clear
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/index.html	2014-12-15 15:24:52 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/index.html	2014-12-17 14:17:16 +0000
@@ -126,7 +126,7 @@
             </div>
             
             <div class="row col-sm-4" ng-if="!lsCacheExists && !idxCacheExists">                
-                <div class="alert alert-info">{{'cache_empty'| translate}}</div>                
+                <div class="alert alert-info">{{ afterClearing ? 'cache_cleared' : 'nothing_to_clear' | translate}}</div>                
             </div>
             
         </div>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/scripts/controllers.js	2014-12-16 07:54:45 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/scripts/controllers.js	2014-12-17 14:17:16 +0000
@@ -6,6 +6,8 @@
 //Controller for settings page
 .controller('MainController', function($scope, storage, $window, idbStorageService, ModalService) {
     
+    $scope.afterClearing = false;
+    
     var getItemsToClear = function(){
         
         $scope.lsCacheExists = false;
@@ -65,7 +67,8 @@
                         
                     });
                 }
-            });            
+            });   
+            $scope.afterClearing = true;
             getItemsToClear();            
         });
     };

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/dhis2/directives.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/dhis2/directives.js	2014-12-16 15:44:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/dhis2/directives.js	2014-12-17 14:17:16 +0000
@@ -14,7 +14,7 @@
                 return parseFloat(value || '');
             });
         }
-    };   
+    };
 })
 
 .directive('selectedOrgUnit', function($timeout, storage) {        
@@ -28,7 +28,11 @@
                 dhis2.ou.store.open().done( function() {
                     selection.load();
                     $( "#orgUnitTree" ).one( "ouwtLoaded", function(event, ids, names) {
-                        console.log('Finished loading orgunit tree');                        
+                        console.log('Finished loading orgunit tree');
+                        
+                        //Disable ou selection until meta-data has downloaded
+                        $( "#orgUnitTree" ).addClass( "disable-clicks" );
+                        
                         downloadMetaData();
                     });
                 });
@@ -114,7 +118,8 @@
 })
 
 .directive('typeaheadOpenOnFocus', function () {
-  return {
+  	
+  	return {
         require: ['typeahead', 'ngModel'],
         link: function (scope, element, attr, ctrls) {
             element.bind('focus', function () {
@@ -147,10 +152,11 @@
 })
 
 .directive('d2PopOver', function($compile, $templateCache){
+    
     return {        
         restrict: 'EA',
         link: function(scope, element, attrs){
-            var content = $templateCache.get("note.html");
+            var content = $templateCache.get("popover.html");
             content = $compile(content)(scope);
             var options = {
                     content: content,
@@ -185,6 +191,7 @@
 })
 
 .directive('serversidePaginator', function factory() {
+    
     return {
         restrict: 'E',
         controller: function ($scope, Paginator) {
@@ -195,11 +202,12 @@
 })
 
 .directive('draggableModal', function(){
+    
     return {
-      restrict: 'EA',
-      link: function(scope, element) {
-        element.draggable();
-      }
+      	restrict: 'EA',
+      	link: function(scope, element) {
+        	element.draggable();
+      	}
     };  
 })
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2014-12-09 07:25:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2014-12-17 14:17:16 +0000
@@ -36,6 +36,7 @@
 M_dhis-web-event-capture=See Event Capture module
 M_dhis-web-tracker-capture=See Tracker Capture module
 M_dhis-web-event-visualizer=See Event Visualizer module
+M_dhis-web-cache-cleaner=See Browser Cache Cleaner module
 
 #-- User action privilegies ---------------------------------------------------#