Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rfc085e0eda6c46d659c5b98f9ee9e29f495af042 -r66f147e9d94ea10fa2c2cea70a78d6479096ddc7
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision fc085e0eda6c46d659c5b98f9ee9e29f495af042)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7)
@@ -122,7 +122,7 @@
       />
       <forward
         name="controlActivity"
-        path="/controlBottomFrame.jsp"
+        path="/dummyControlBottomFrame.jsp"
         redirect="false"
       />
     </action>
@@ -277,7 +277,7 @@
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-<message-resources parameter="org.lamsfoundation.lams.learning.LearningResources" />
+<message-resources parameter="org.lamsfoundation.lams.learning.ApplicationResources" />
 
 <plug-in className="org.apache.struts.tiles.TilesPlugin">
 	<set-property property="definitions-config" value="/WEB-INF/struts/tiles-defs.xml" />