=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/manifest.webapp'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/manifest.webapp	2014-03-10 12:31:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/manifest.webapp	2014-08-31 15:55:29 +0000
@@ -15,7 +15,7 @@
     "default_locale": "en",
     "activities": {
         "dhis": {
-            "href": "../.."
+            "href": ".."
         }
     }
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/manifest.webapp'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/manifest.webapp	2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/manifest.webapp	2014-08-31 15:55:29 +0000
@@ -15,7 +15,7 @@
     "default_locale": "en",
     "activities": {
         "dhis": {
-            "href": "../.."
+            "href": ".."
         }
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2014-08-27 14:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2014-08-31 15:55:29 +0000
@@ -7078,7 +7078,7 @@
                         init.dateFormat = info.dateFormat || 'yyyy-mm-dd';
 
                         (function() {
-                            var dhis2PeriodUrl = '../../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
+                            var dhis2PeriodUrl = '../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
                                 defaultCalendarId = 'gregorian',
                                 calendarIdMap = {'iso8601': defaultCalendarId},
                                 calendarId = calendarIdMap[info.calendar] || info.calendar || defaultCalendarId,
@@ -7093,7 +7093,7 @@
                             };
 
                             if (Ext.Array.contains(calendarIds, calendarId)) {
-                                calendarScriptUrl = '../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
+                                calendarScriptUrl = '../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
 
                                 Ext.Loader.injectScriptElement(calendarScriptUrl, function() {
                                     Ext.Loader.injectScriptElement(dhis2PeriodUrl, createGenerator);

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/manifest.webapp'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/manifest.webapp	2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/manifest.webapp	2014-08-31 15:55:29 +0000
@@ -15,7 +15,7 @@
     "default_locale": "en",
     "activities": {
         "dhis": {
-            "href": "../.."
+            "href": ".."
         }
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2014-08-27 14:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2014-08-31 15:55:29 +0000
@@ -6714,7 +6714,7 @@
                         init.dateFormat = info.dateFormat || 'yyyy-mm-dd';
 
                         (function() {
-                            var dhis2PeriodUrl = '../../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
+                            var dhis2PeriodUrl = '../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
                                 defaultCalendarId = 'gregorian',
                                 calendarIdMap = {'iso8601': defaultCalendarId},
                                 calendarId = calendarIdMap[info.calendar] || info.calendar || defaultCalendarId,
@@ -6729,7 +6729,7 @@
                             };
 
                             if (Ext.Array.contains(calendarIds, calendarId)) {
-                                calendarScriptUrl = '../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
+                                calendarScriptUrl = '../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
 
                                 Ext.Loader.injectScriptElement(calendarScriptUrl, function() {
                                     Ext.Loader.injectScriptElement(dhis2PeriodUrl, createGenerator);

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp	2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp	2014-08-31 15:55:29 +0000
@@ -15,7 +15,7 @@
     "default_locale": "en",
     "activities": {
         "dhis": {
-            "href": "../.."
+            "href": ".."
         }
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2014-08-27 14:03:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2014-08-31 15:55:29 +0000
@@ -8867,7 +8867,7 @@
 						xtype: 'button',
 						text: GIS.i18n.home,
 						handler: function() {
-							window.location.href = '../../dhis-web-commons-about/redirect.action';
+							window.location.href = '../dhis-web-commons-about/redirect.action';
 						}
 					});
 
@@ -9145,7 +9145,7 @@
                         init.dateFormat = info.dateFormat || 'yyyy-mm-dd';
 
                         (function() {
-                            var dhis2PeriodUrl = '../../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
+                            var dhis2PeriodUrl = '../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
                                 defaultCalendarId = 'gregorian',
                                 calendarIdMap = {'iso8601': defaultCalendarId},
                                 calendarId = calendarIdMap[info.calendar] || info.calendar || defaultCalendarId,
@@ -9160,7 +9160,7 @@
                             };
 
                             if (Ext.Array.contains(calendarIds, calendarId)) {
-                                calendarScriptUrl = '../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
+                                calendarScriptUrl = '../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
 
                                 Ext.Loader.injectScriptElement(calendarScriptUrl, function() {
                                     Ext.Loader.injectScriptElement(dhis2PeriodUrl, createGenerator);

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Facility.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Facility.js	2013-02-04 20:51:33 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Facility.js	2014-08-31 15:55:29 +0000
@@ -146,7 +146,7 @@
             var rule = new OpenLayers.Rule({
                 symbolizer: {
                     'pointRadius': 8,
-                    'externalGraphic': '../../images/orgunitgroup/' + items[i].data.symbol
+                    'externalGraphic': '../images/orgunitgroup/' + items[i].data.symbol
                 },
                 filter: new OpenLayers.Filter.Comparison({
                     type: OpenLayers.Filter.Comparison.EQUAL_TO,
@@ -184,7 +184,7 @@
 
         for (var i = 0; i < items.length; i++) {
             child = document.createElement("div");
-            child.style.backgroundImage = 'url(../../images/orgunitgroup/' + items[i].data.symbol + ')';
+            child.style.backgroundImage = 'url(../images/orgunitgroup/' + items[i].data.symbol + ')';
             child.style.backgroundRepeat = 'no-repeat';
             child.style.width = "25px";
             child.style.height = "18px";

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/all.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/all.js	2014-08-18 13:24:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/all.js	2014-08-31 15:55:29 +0000
@@ -134,7 +134,7 @@
             var rule = new OpenLayers.Rule({
                 symbolizer: {
                     'pointRadius': 8,
-                    'externalGraphic': '../../images/orgunitgroup/' + items[i].data.symbol
+                    'externalGraphic': '../images/orgunitgroup/' + items[i].data.symbol
                 },
                 filter: new OpenLayers.Filter.Comparison({
                     type: OpenLayers.Filter.Comparison.EQUAL_TO,
@@ -156,7 +156,7 @@
 
         for (var i = 0; i < items.length; i++) {
             child = document.createElement("div");
-            child.style.backgroundImage = 'url(../../images/orgunitgroup/' + items[i].data.symbol + ')';
+            child.style.backgroundImage = 'url(../images/orgunitgroup/' + items[i].data.symbol + ')';
             child.style.backgroundRepeat = 'no-repeat';
             child.style.width = "21px";
             child.style.height = "16px";

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/plugin.js	2014-08-26 12:21:53 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/plugin.js	2014-08-31 15:55:29 +0000
@@ -4758,7 +4758,7 @@
 				var rule = new OpenLayers.Rule({
 					symbolizer: {
 						'pointRadius': 8,
-						'externalGraphic': '../../images/orgunitgroup/' + items[i].data.symbol
+						'externalGraphic': '../images/orgunitgroup/' + items[i].data.symbol
 					},
 					filter: new OpenLayers.Filter.Comparison({
 						type: OpenLayers.Filter.Comparison.EQUAL_TO,
@@ -4780,7 +4780,7 @@
 
 			for (var i = 0; i < items.length; i++) {
 				child = document.createElement("div");
-				child.style.backgroundImage = 'url(../../images/orgunitgroup/' + items[i].data.symbol + ')';
+				child.style.backgroundImage = 'url(../images/orgunitgroup/' + items[i].data.symbol + ')';
 				child.style.backgroundRepeat = 'no-repeat';
 				child.style.width = "21px";
 				child.style.height = "16px";

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/manifest.webapp'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/manifest.webapp	2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/manifest.webapp	2014-08-31 15:55:29 +0000
@@ -15,7 +15,7 @@
     "default_locale": "en",
     "activities": {
         "dhis": {
-            "href": "../.."
+            "href": ".."
         }
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2014-08-29 10:39:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2014-08-31 15:55:29 +0000
@@ -6188,7 +6188,7 @@
 
                                 // calendar
                                 (function() {
-                                    var dhis2PeriodUrl = '../../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
+                                    var dhis2PeriodUrl = '../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
                                         defaultCalendarId = 'gregorian',
                                         calendarIdMap = {'iso8601': defaultCalendarId},
                                         calendarId = calendarIdMap[init.systemInfo.calendar] || init.systemInfo.calendar || defaultCalendarId,
@@ -6203,7 +6203,7 @@
                                     };
 
                                     if (Ext.Array.contains(calendarIds, calendarId)) {
-                                        calendarScriptUrl = '../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
+                                        calendarScriptUrl = '../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
 
                                         Ext.Loader.injectScriptElement(calendarScriptUrl, function() {
                                             Ext.Loader.injectScriptElement(dhis2PeriodUrl, createGenerator);

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/manifest.webapp'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/manifest.webapp	2014-03-17 15:59:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/manifest.webapp	2014-08-31 15:55:29 +0000
@@ -15,7 +15,7 @@
     "default_locale": "en",
     "activities": {
         "dhis": {
-            "href": "../.."
+            "href": ".."
         }
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/manifest.webapp'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/manifest.webapp	2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/manifest.webapp	2014-08-31 15:55:29 +0000
@@ -15,7 +15,7 @@
     "default_locale": "en",
     "activities": {
         "dhis": {
-            "href": "../.."
+            "href": ".."
         }
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2014-08-29 10:39:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2014-08-31 15:55:29 +0000
@@ -6081,7 +6081,7 @@
 
                                 // calendar
                                 (function() {
-                                    var dhis2PeriodUrl = '../../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
+                                    var dhis2PeriodUrl = '../dhis-web-commons/javascripts/dhis2/dhis2.period.js',
                                         defaultCalendarId = 'gregorian',
                                         calendarIdMap = {'iso8601': defaultCalendarId},
                                         calendarId = calendarIdMap[init.systemInfo.calendar] || init.systemInfo.calendar || defaultCalendarId,
@@ -6096,7 +6096,7 @@
                                     };
 
                                     if (Ext.Array.contains(calendarIds, calendarId)) {
-                                        calendarScriptUrl = '../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
+                                        calendarScriptUrl = '../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + calendarId + '.min.js';
 
                                         Ext.Loader.injectScriptElement(calendarScriptUrl, function() {
                                             Ext.Loader.injectScriptElement(dhis2PeriodUrl, createGenerator);