Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r1de0a203f1cc55783cffd95742782070877781cb -ra8a83ef915717f418399b46f4c1df68be0ba8d18
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 1de0a203f1cc55783cffd95742782070877781cb)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision a8a83ef915717f418399b46f4c1df68be0ba8d18)
@@ -1,4 +1,4 @@
-/**
+/**
  * This file contains main methods for Authoring.
  */
 
@@ -1747,7 +1747,7 @@
 					'title'			   : ld.title,
 					'maxUIID'		   : 0,
 					'readOnly'		   : ld.readOnly,
-					'canModify'		   : ld.copyTypeID == 1
+					'canModify'		   : ld.copyTypeID == 1 || ld.editOverrideLock
 				};
 				
 				if (!isReadOnlyMode) {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
===================================================================
diff -u -r6660bc5678e365bb5a25988c18c491c850550edb -ra8a83ef915717f418399b46f4c1df68be0ba8d18
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java	(.../ActivityMappingStrategy.java)	(revision 6660bc5678e365bb5a25988c18c491c850550edb)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java	(.../ActivityMappingStrategy.java)	(revision a8a83ef915717f418399b46f4c1df68be0ba8d18)
@@ -36,7 +36,7 @@
 
     private static Logger log = Logger.getLogger(ActivityMappingStrategy.class);
 
-    private static final String PROGRESS_BROKEN_ACTION = "/progressBroken.do";
+    private static final String PROGRESS_BROKEN_ACTION = "/progressBroken.jsp";
 
     /**
      * Returns the struts action used to display the specified activity.
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -ra8a83ef915717f418399b46f4c1df68be0ba8d18
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a8a83ef915717f418399b46f4c1df68be0ba8d18)
@@ -241,7 +241,7 @@
 learners.search.phrase.clear.tooltip  =Clear search results
 button.live.edit  =Live Edit
 button.live.edit.tooltip  =Edit the current design for this lesson
-button.live.edit.confirm  =Live Edit allows you to modify the design of your lesson while the learners are attempting it. If you continue, your design will appear in Authoring for you to modify. Once you have done your changes you MUST "Apply changes" to the design so learners can progress. If these changes are not applied, the learners will NOT be able to continue with the lesson. Do you want to continue?
+button.live.edit.confirm  =Live Edit allows you to modify the design of your lesson while the learners are attempting it. If you continue, your design will appear in Authoring for you to modify. Once you have done your changes you MUST "Save" the changes to the design so learners can progress. If these changes are not applied, the learners will NOT be able to continue with the lesson. Do you want to continue?
 button.journal.entries  =Journal entries
 button.journal.entries.tooltip  =View all Journal Entries saved by Learners
 tab.lesson  =Lesson
Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -ra8a83ef915717f418399b46f4c1df68be0ba8d18
--- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a8a83ef915717f418399b46f4c1df68be0ba8d18)
@@ -241,7 +241,7 @@
 learners.search.phrase.clear.tooltip  =Clear search results
 button.live.edit  =Live Edit
 button.live.edit.tooltip  =Edit the current design for this lesson
-button.live.edit.confirm  =Live Edit allows you to modify the design of your lesson while the learners are attempting it. If you continue, your design will appear in Authoring for you to modify. Once you have done your changes you MUST "Apply changes" to the design so learners can progress. If these changes are not applied, the learners will NOT be able to continue with the lesson. Do you want to continue?
+button.live.edit.confirm  =Live Edit allows you to modify the design of your lesson while the learners are attempting it. If you continue, your design will appear in Authoring for you to modify. Once you have done your changes you MUST "Save" the changes to the design so learners can progress. If these changes are not applied, the learners will NOT be able to continue with the lesson. Do you want to continue?
 button.journal.entries  =Journal entries
 button.journal.entries.tooltip  =View all Journal Entries saved by Learners
 tab.lesson  =Lesson