Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rd7fc49af08b521b8dedb73cac381576a96b6f853 -r5415f5a05320eb3f012acf7b04b3f233fcdce0a8
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rd7fc49af08b521b8dedb73cac381576a96b6f853 -r5415f5a05320eb3f012acf7b04b3f233fcdce0a8
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -rfb2dde987b53f955ae6ef0cdb65992f579b89a50 -r5415f5a05320eb3f012acf7b04b3f233fcdce0a8
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision fb2dde987b53f955ae6ef0cdb65992f579b89a50)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 5415f5a05320eb3f012acf7b04b3f233fcdce0a8)
@@ -696,7 +696,7 @@
 			}
 		}
 		
-		if(_canvasModel.getCanvas().ddm.editOverrideLock) {
+		if(_canvasModel.getCanvas().ddm.editOverrideLock && _canvasModel.selectedItem.activity.activityID != null) {
 			branchType_cmb.enabled = false;
 		}