Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4095794ad6f0cd55ff0256034bc59f31ccf507bd -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4095794ad6f0cd55ff0256034bc59f31ccf507bd)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Tue Oct 10 22:43:50 CST 2017 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Oct 16 03:14:44 CST 2017 
  
 #=================== labels for Assessment =================# 
 
@@ -175,7 +175,6 @@
 label.monitoring.question.summary.average.mark  =Average mark
 label.monitoring.question.summary.group  =Group:
 label.monitoring.question.summary.ok  =Ok
-message.monitoring.edit.activity.not.editable  =This Activity is no longer editable.
 output.desc.learner.total.score  =Last total score
 output.desc.learner.time.taken  =Time taken
 output.desc.learner.number.of.attempts  =Number of attempts made by user
@@ -316,6 +315,7 @@
 label.error  =Error
 error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
 label.ok  =OK
+message.monitoring.edit.activity.warning  =Warning: if you edit and modify a question or change an answer that a learner has already answered, then the mark attained for the modified question will be deleted as it is assumed that the question has changed. If the option for retries is available, then the learner can submit an answer for this question again.
 
 
 #======= End labels: Exported 310 labels for en AU =====
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r4095794ad6f0cd55ff0256034bc59f31ccf507bd -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 4095794ad6f0cd55ff0256034bc59f31ccf507bd)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Tue Oct 10 22:43:50 CST 2017 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Oct 16 03:14:44 CST 2017 
  
 #=================== labels for Assessment =================# 
 
@@ -175,7 +175,6 @@
 label.monitoring.question.summary.average.mark  =Average mark
 label.monitoring.question.summary.group  =Group:
 label.monitoring.question.summary.ok  =Ok
-message.monitoring.edit.activity.not.editable  =This Activity is no longer editable.
 output.desc.learner.total.score  =Last total score
 output.desc.learner.time.taken  =Time taken
 output.desc.learner.number.of.attempts  =Number of attempts made by user
@@ -316,6 +315,7 @@
 label.error  =Error
 error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
 label.ok  =OK
+message.monitoring.edit.activity.warning  =Warning: if you edit and modify a question or change an answer that a learner has already answered, then the mark attained for the modified question will be deleted as it is assumed that the question has changed. If the option for retries is available, then the learner can submit an answer for this question again.
 
 
 #======= End labels: Exported 310 labels for en AU =====
Index: lams_tool_assessment/web/pages/monitoring/.editactivity.jsp.swp
===================================================================
diff -u
Binary files differ
Index: lams_tool_assessment/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_assessment/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -2,6 +2,10 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="assessment" value="${sessionMap.assessment}"/>
 
+<lams:Alert id="editWarning" type="warning" close="false">
+    <fmt:message key="message.monitoring.edit.activity.warning" />
+</lams:Alert>
+
 <table class="table table-condensed">
 	<tr>
 		<td width="10%">
Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r42d2cb5b3e64704ff403a6292242b0f04c7c242e -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 42d2cb5b3e64704ff403a6292242b0f04c7c242e)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Tue Oct 10 22:22:11 CST 2017 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Oct 16 03:16:32 CST 2017 
  
 #=================== labels for Multiple Choice Questions =================# 
 
@@ -213,6 +213,7 @@
 label.error  =Error
 error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
 label.ok  =OK
+message.monitoring.edit.activity.warning  =Warning: if you edit and modify a question or change an answer that a learner has already answered, then the mark attained for the modified question will be deleted as it is assumed that the question has changed. If the option for retries is available, then the learner can submit an answer for this question again.
 
 
-#======= End labels: Exported 207 labels for en AU =====
+#======= End labels: Exported 208 labels for en AU =====
Index: lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r42d2cb5b3e64704ff403a6292242b0f04c7c242e -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 42d2cb5b3e64704ff403a6292242b0f04c7c242e)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Tue Oct 10 22:22:11 CST 2017 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Oct 16 03:16:32 CST 2017 
  
 #=================== labels for Multiple Choice Questions =================# 
 
@@ -213,6 +213,7 @@
 label.error  =Error
 error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
 label.ok  =OK
+message.monitoring.edit.activity.warning  =Warning: if you edit and modify a question or change an answer that a learner has already answered, then the mark attained for the modified question will be deleted as it is assumed that the question has changed. If the option for retries is available, then the learner can submit an answer for this question again.
 
 
-#======= End labels: Exported 207 labels for en AU =====
+#======= End labels: Exported 208 labels for en AU =====
Index: lams_tool_lamc/web/monitoring/Edit.jsp
===================================================================
diff -u -r463f7b3dbb88ee41210f7170dc19dc25360cd26f -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_lamc/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 463f7b3dbb88ee41210f7170dc19dc25360cd26f)
+++ lams_tool_lamc/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -1,5 +1,9 @@
 <%@ include file="/common/taglibs.jsp"%>
 
+<lams:Alert id="editWarning" type="warning" close="false">
+    <fmt:message key="message.monitoring.edit.activity.warning" />
+</lams:Alert>
+
 <table class="table table-condensed">
 	<tr>
 		<td width="10%" ><fmt:message key="label.authoring.title.col"></fmt:message></td>
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r90136820195d7768c6dbd79b3716d595476ecb31 -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 90136820195d7768c6dbd79b3716d595476ecb31)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Thu Jul 20 02:27:54 CST 2017 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Oct 16 03:02:59 CST 2017 
  
 #=================== labels for Scratchie =================# 
 
@@ -31,7 +31,6 @@
 monitoring.tab.edit.activity  =Edit activity
 monitoring.label.group  =Group
 label.monitoring.edit.activity.edit  =Edit
-message.monitoring.edit.activity.not.editable  =This activity is no longer editable
 export.title  =Export portfolio for Scratchie
 label.edit  =Edit
 label.finished  =Next activity
@@ -209,6 +208,7 @@
 label.marks  =Marks
 label.number.groups.in.mark.range  =Number of groups in mark range
 label.average.mark  =Average mark
+message.monitoring.edit.activity.warning  =Warning: if you edit and modify a question or change an answer that a leader has already answered, then the mark for the whole group for the modified question will be deleted permanently as it is assumed that the question has changed.
 
 
 #======= End labels: Exported 203 labels for en AU =====
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r90136820195d7768c6dbd79b3716d595476ecb31 -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 90136820195d7768c6dbd79b3716d595476ecb31)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Thu Jul 20 02:27:54 CST 2017 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Oct 16 03:02:59 CST 2017 
  
 #=================== labels for Scratchie =================# 
 
@@ -31,7 +31,6 @@
 monitoring.tab.edit.activity  =Edit activity
 monitoring.label.group  =Group
 label.monitoring.edit.activity.edit  =Edit
-message.monitoring.edit.activity.not.editable  =This activity is no longer editable
 export.title  =Export portfolio for Scratchie
 label.edit  =Edit
 label.finished  =Next activity
@@ -209,6 +208,7 @@
 label.marks  =Marks
 label.number.groups.in.mark.range  =Number of groups in mark range
 label.average.mark  =Average mark
+message.monitoring.edit.activity.warning  =Warning: if you edit and modify a question or change an answer that a leader has already answered, then the mark for the whole group for the modified question will be deleted permanently as it is assumed that the question has changed.
 
 
 #======= End labels: Exported 203 labels for en AU =====
Index: lams_tool_scratchie/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r58448aa728e808e025d15546ea5375e6db321ff3 -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 58448aa728e808e025d15546ea5375e6db321ff3)
+++ lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -2,6 +2,10 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="scratchie" value="${sessionMap.scratchie}"/>
 
+<lams:Alert id="editWarning" type="warning" close="false">
+    <fmt:message key="message.monitoring.edit.activity.warning" />
+</lams:Alert>
+
 <table class="table table-condensed">
 	<tr>
 		<td width="10%" nowrap>
Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r901ac21da1c5ff5769fde7547f6e23a433df519c -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 901ac21da1c5ff5769fde7547f6e23a433df519c)
+++ lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Sat Dec 03 17:30:13 CST 2016 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Oct 16 03:38:30 CST 2017 
  
 #=================== labels for Voting =================# 
 
@@ -160,6 +160,7 @@
 label.activity.completion  =End of activity
 js.error.validate.number  =There is an error with the minimum and/or maximum number of votes. Please check and try again.
 label.search  =Search...
+message.monitoring.edit.activity.warning  =Warning: if you edit and modify a nomination that has already been selected, it would be reseted to zero -as the nomination has changed.
 
 
-#======= End labels: Exported 154 labels for en AU =====
+#======= End labels: Exported 155 labels for en AU =====
Index: lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r901ac21da1c5ff5769fde7547f6e23a433df519c -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 901ac21da1c5ff5769fde7547f6e23a433df519c)
+++ lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Sat Dec 03 17:30:13 CST 2016 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Oct 16 03:38:30 CST 2017 
  
 #=================== labels for Voting =================# 
 
@@ -160,6 +160,7 @@
 label.activity.completion  =End of activity
 js.error.validate.number  =There is an error with the minimum and/or maximum number of votes. Please check and try again.
 label.search  =Search...
+message.monitoring.edit.activity.warning  =Warning: if you edit and modify a nomination that has already been selected, it would be reseted to zero -as the nomination has changed.
 
 
-#======= End labels: Exported 154 labels for en AU =====
+#======= End labels: Exported 155 labels for en AU =====
Index: lams_tool_vote/web/monitoring/Edit.jsp
===================================================================
diff -u -r58448aa728e808e025d15546ea5375e6db321ff3 -r556d465d0c2dba467f2acef7d29c0f8261ecf84b
--- lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 58448aa728e808e025d15546ea5375e6db321ff3)
+++ lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
@@ -1,6 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
+<lams:Alert id="editWarning" type="warning" close="false">
+    <fmt:message key="message.monitoring.edit.activity.warning" />
+</lams:Alert>
+
 <table class="table table-condensed">
 	<tr>
 		<td width="15%"><fmt:message key="label.authoring.title.col"></fmt:message></td>