=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-09-26 14:59:56 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-09-29 20:10:45 +0000
@@ -45,6 +45,7 @@
 dhis-web-maintenance-settings=Settings
 dhis-web-maintenance-patient=Persons and Programs
 dhis-web-maintenance-mobile=Mobile configuration
+dhis-web-maintenance-appmanager=Apps
 dhis-web-caseentry=Individual Records
 dhis-web-dataentry=Data Entry
 dhis-web-importexport=Import-Export
@@ -66,7 +67,6 @@
 dhis-web-sms=SMS
 dhis-web-maintenance-in=Configuration
 dhis-web-linelisting-mp=Manpower
-dhis-web-appmanager=Apps
 
 #-- Intro modules -------------------------------------------------------------#
 

=== renamed directory 'dhis-2/dhis-web/dhis-web-appmanager' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager'
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/pom.xml'
--- dhis-2/dhis-web/dhis-web-appmanager/pom.xml	2013-09-26 16:34:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/pom.xml	2013-09-29 20:10:45 +0000
@@ -8,12 +8,12 @@
     <version>2.13-SNAPSHOT</version>
   </parent>
 
-  <artifactId>dhis-web-appmanager</artifactId>
+  <artifactId>dhis-web-maintenance-appmanager</artifactId>
   <packaging>war</packaging>
   <name>DHIS App Manager</name>
 
   <build>
-    <finalName>dhis-web-appmanager</finalName>
+    <finalName>dhis-web-maintenance-appmanager</finalName>
   </build>
 
   <dependencies>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/resources/struts.xml	2013-05-28 15:50:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/struts.xml	2013-09-29 20:10:45 +0000
@@ -6,7 +6,7 @@
 
   <include file="dhis-web-commons.xml" />
 
-  <package name="dhis-web-appmanager" extends="dhis-web-commons" namespace="/dhis-web-appmanager">
+  <package name="dhis-web-maintenance-appmanager" extends="dhis-web-commons" namespace="/dhis-web-maintenance-appmanager">
     
     <!-- AppManager -->
     
@@ -16,29 +16,29 @@
     
     <action name="appList" class="org.hisp.dhis.appmanager.action.AppListAction">
       <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-appmanager/index.vm</param>
-      <param name="menu">/dhis-web-appmanager/menu.vm</param>
+      <param name="page">/dhis-web-maintenance-appmanager/index.vm</param>
+      <param name="menu">/dhis-web-maintenance-appmanager/menu.vm</param>
     </action>
     
     <action name="addApp" class="org.hisp.dhis.appmanager.action.AddAppAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <result name="failure" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
-      <param name="menu">/dhis-web-appmanager/menu.vm</param>
+      <param name="menu">/dhis-web-maintenance-appmanager/menu.vm</param>
       <param name="javascripts">javascript/jquery.form.js</param>
       <interceptor-ref name="fileUploadStack" />
     </action>
     
     <action name="deleteApp" class="org.hisp.dhis.appmanager.action.DeleteAppAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
-      <param name="page">/dhis-web-appmanager/index.vm</param>
-      <param name="menu">/dhis-web-appmanager/menu.vm</param>
+      <param name="page">/dhis-web-maintenance-appmanager/index.vm</param>
+      <param name="menu">/dhis-web-maintenance-appmanager/menu.vm</param>
       <param name="javascripts">javascript/jquery.form.js</param>
     </action>
     
     <action name="appStore" class="org.hisp.dhis.appmanager.action.AppStoreAction">
       <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-appmanager/getApps.vm</param>
-      <param name="menu">/dhis-web-appmanager/menu.vm</param>
+      <param name="page">/dhis-web-maintenance-appmanager/getApps.vm</param>
+      <param name="menu">/dhis-web-maintenance-appmanager/menu.vm</param>
       <param name="javascripts">javascript/jquery.form.js,javascript/uploadApp.js</param>
       <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
     </action>
@@ -46,8 +46,8 @@
     <action name="appSettings" class="org.hisp.dhis.appmanager.action.AppSettingsAction">
       <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <result name="getSuccess" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-appmanager/appSettings.vm</param>
-      <param name="menu">/dhis-web-appmanager/menu.vm</param>
+      <param name="page">/dhis-web-maintenance-appmanager/appSettings.vm</param>
+      <param name="menu">/dhis-web-maintenance-appmanager/menu.vm</param>
       <param name="onExceptionReturn">plainTextError</param>
       <param name="javascripts">javascript/jquery.form.js,javascript/deleteApp.js</param>
       <param name="requiredAuthorities">F_SYSTEM_SETTING</param>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/WEB-INF/classes/velocity.properties'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/WEB-INF/classes/velocity.properties	2013-05-23 00:18:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/WEB-INF/classes/velocity.properties	2013-09-29 20:10:45 +0000
@@ -1,3 +1,3 @@
 resource.loader = dev
 dev.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-dev.resource.loader.path = src/main/webapp,../dhis-web-commons-resources/src/main/webapp
\ No newline at end of file
+dev.resource.loader.path = src/main/webapp,../../dhis-web-commons-resources/src/main/webapp
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/WEB-INF/web.xml	2013-05-23 00:18:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/WEB-INF/web.xml	2013-09-29 20:10:45 +0000
@@ -18,7 +18,7 @@
     <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
     <init-param>
       <param-name>redirectPath</param-name>
-      <param-value>dhis-web-appmanager/appList.action</param-value>
+      <param-value>dhis-web-maintenance-appmanager/appList.action</param-value>
     </init-param>
   </filter>
   <filter>

=== renamed directory 'dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager'
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/index.vm'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/index.vm	2013-09-26 18:17:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/index.vm	2013-09-29 20:10:45 +0000
@@ -1,4 +1,4 @@
-<h3>$i18n.getString( "dhis-web-appmanager" ) #*openHelp( "appManager" )*#</h3>
+<h3>$i18n.getString( "dhis-web-maintenance-appmanager" ) #*openHelp( "appManager" )*#</h3>
 
 <ul class="introList">
 #if( $appList.isEmpty() )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/menu.vm'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/menu.vm	2013-06-10 15:15:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/menu.vm	2013-09-29 20:10:45 +0000
@@ -1,7 +1,7 @@
-<h2>$i18n.getString( "dhis-web-appmanager" )</h2>
+<h2>$i18n.getString( "dhis-web-maintenance-appmanager" )</h2>
 <ul>
     <li><a href="appList.action">$i18n.getString( "appmanager_list_app" )</a></li>
-#if( $auth.hasAccess( "dhis-web-appmanager", "appSettings" ) )
+#if( $auth.hasAccess( "dhis-web-maintenance-appmanager", "appSettings" ) )
     <li><a href="appStore.action">$i18n.getString( "appmanager_app_store" )</a></li>
     <li><a href="appSettings.action">$i18n.getString( "appmanager_settings" )</a></li>
 #end

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/pom.xml	2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/pom.xml	2013-09-29 20:10:45 +0000
@@ -14,6 +14,7 @@
   <name>DHIS Web Modules Maintenance</name>
   
   <modules>
+    <module>dhis-web-maintenance-appmanager</module>
     <module>dhis-web-maintenance-dataset</module>
     <module>dhis-web-maintenance-datadictionary</module>
     <module>dhis-web-maintenance-organisationunit</module>

=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml	2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/pom.xml	2013-09-29 20:10:45 +0000
@@ -30,7 +30,6 @@
     <module>dhis-web-light</module>
     <module>dhis-web-mobile</module>
     <module>dhis-web-sms</module>
-    <module>dhis-web-appmanager</module>
     <module>dhis-web-portal</module>
   </modules>
   <build>