Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r44f25ff763552baf103b1bb4ed7d1d2466a937dc -r8259c99290c1964f229fdad302fdf2f8984b9deb
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 44f25ff763552baf103b1bb4ed7d1d2466a937dc)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 8259c99290c1964f229fdad302fdf2f8984b9deb)
@@ -1,4 +1,4 @@
-/**
+/**
  * This file contains main methods for Authoring.
  */
 
@@ -1746,8 +1746,10 @@
 					'contentFolderID'  : ld.contentFolderID,
 					'title'			   : ld.title,
 					'maxUIID'		   : 0,
-					'readOnly'		   : ld.readOnly,
-					'canModify'		   : ld.copyTypeID == 1 || ld.editOverrideLock
+					'readOnly'		   : ld.readOnly && !ld.editOverrideLock,
+					'canModify'		   : ld.copyTypeID == 1 || ld.editOverrideLock,
+					'editOverrideLock' : ld.editOverrideLock,
+					'copyTypeID'	   : ld.copyTypeID
 				};
 				
 				if (!isReadOnlyMode) {
@@ -2262,7 +2264,6 @@
 					$('#newButton, #openButton').parent().remove();
 					$('#importSequenceButton, #previewButton').remove();
 					$('#saveButton').parent().children('.dropdown-toggle, .dropdown-menu').remove();
-					debugger;
 					$('#saveButton').text(LABELS.LIVE_EDIT_SAVE);
 					$('#cancelLiveEditButton').show();
 				}
@@ -2687,10 +2688,10 @@
 	
 		// serialise the sequence
 		return {
-			'copyTypeID'         : 1,
+			'copyTypeID'         : layout.ld.editOverrideLock ? layout.ld.copyTypeID : 1, // don't change the copyTypeId from 2 to 1 if a LiveEdit is in progress
 			'maxID'				 : layout.ld.maxUIID,
 			'readOnly'			 : false,
-			'editOverrideLock'   : false,
+			'editOverrideLock'   : layout.ld.editOverrideLock,
 			'contentFolderID'    : layout.ld.contentFolderID,
 			'licenseID'			 : $('#ldDescriptionLicenseSelect').val(),
 			'licenseText'   	 : $('#ldDescriptionLicenseSelect').val() == "0"
@@ -2934,7 +2935,6 @@
 			return false;
 		}
 		
-		debugger;
 		// check if we are in SVG recreation mode (Monitoring, Add Lesson)
 		// and we need to update activities' coordinates on the back end
 		if (isReadOnlyMode && layout.wasArranged) {
Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r8259c99290c1964f229fdad302fdf2f8984b9deb
--- lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8259c99290c1964f229fdad302fdf2f8984b9deb)
@@ -51,8 +51,8 @@
 label.close.button  =Close
 mynotes.journals.title  =Journals
 mynotes.entry.no.title.label  =No title
-message.progress.broken  =An error has occurred and you cannot continue without LAMS recalculating your current activity. A staff member may be editing the lesson.
-message.progress.broken.try.resume  =Close and reopen this window to continue. If this error re-occurs, wait a few minutes and then try again.
+message.progress.broken  =Your teacher is currently editing the lesson. As soon as the changes are applied you will be able to continue. 
+message.progress.broken.try.resume  =Close and reopen this window to continue. If this message re-occurs, wait a few minutes and then try again.
 label.branching.wait.message  =You have stopped at a branching point. You cannot continue until your branch is allocated in Monitoring.
 label.branching.refresh.message  =Click Next if you are told that the branch has been selected. This page will refresh automatically in 1 minute.
 label.branching.preview.message  =You have reached a branching activity. As you are in preview you can select which branch to preview then click Choose. Click Finish to skip the branching and continue with the next activity after the branching.
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r8259c99290c1964f229fdad302fdf2f8984b9deb
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8259c99290c1964f229fdad302fdf2f8984b9deb)
@@ -1,3 +1,5 @@
+message.progress.broken  =Your teacher is currently editing the lesson. As soon as the changes are applied you will be able to continue. 
+message.progress.broken.try.resume  =Close and reopen this window to continue. If this message re-occurs, wait a few minutes and then try again.
 appName = learner_java 
 #language code: en 
 #locale code: AU 
@@ -51,8 +53,8 @@
 label.close.button  =Close
 mynotes.journals.title  =Journals
 mynotes.entry.no.title.label  =No title
-message.progress.broken  =An error has occurred and you cannot continue without LAMS recalculating your current activity. A staff member may be editing the lesson.
-message.progress.broken.try.resume  =Close and reopen this window to continue. If this error re-occurs, wait a few minutes and then try again.
+message.progress.broken  =Your teacher is currently editing the lesson. As soon as the changes are applied you will be able to continue. 
+message.progress.broken.try.resume  =Close and reopen this window to continue. If this message re-occurs, wait a few minutes and then try again.
 label.branching.wait.message  =You have stopped at a branching point. You cannot continue until your branch is allocated in Monitoring.
 label.branching.refresh.message  =Click Next if you are told that the branch has been selected. This page will refresh automatically in 1 minute.
 label.branching.preview.message  =You have reached a branching activity. As you are in preview you can select which branch to preview then click Choose. Click Finish to skip the branching and continue with the next activity after the branching.