Index: lams_tool_lamc/.classpath
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/.classpath	(.../.classpath)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/.classpath	(.../.classpath)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-5.0.10.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
===================================================================
diff -u -rd23fcf9ab9460608167c49146cc54dc64b516110 -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java	(.../McController.java)	(revision d23fcf9ab9460608167c49146cc54dc64b516110)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java	(.../McController.java)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -138,6 +138,8 @@
 	sessionMap.put(McAppConstants.LIST_DELETED_QUESTION_DTOS, listDeletedQuestionDTOs);
 
 	return "authoring/AuthoringTabsHolder";
+	
+	
     }
 
     /**
@@ -598,7 +600,6 @@
      * Prepares MC questions for QTI packing
      */
     @RequestMapping("/exportQTI")
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     public String exportQTI(HttpServletRequest request, HttpServletResponse response) {
 	String sessionMapId = request.getParameter(McAppConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
===================================================================
diff -u -r424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java	(.../McMonitoringController.java)	(revision 424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java	(.../McMonitoringController.java)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -41,8 +41,6 @@
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.mc.McAppConstants;
@@ -347,8 +345,7 @@
      */
     @RequestMapping(path = "/setActivityEvaluation", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ResponseBody
-    public String setActivityEvaluation(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
+    public String setActivityEvaluation(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
 	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
 	String activityEvaluation = WebUtil.readStrParam(request, McAppConstants.ATTR_ACTIVITY_EVALUATION);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McLearningForm.java
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McLearningForm.java	(.../McLearningForm.java)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McLearningForm.java	(.../McLearningForm.java)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -24,8 +24,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 
 /**
Fisheye: Tag e1e8890bd7a972827bd9449eeb7f76a9b42c5913 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1e8890bd7a972827bd9449eeb7f76a9b42c5913 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1e8890bd7a972827bd9449eeb7f76a9b42c5913 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1e8890bd7a972827bd9449eeb7f76a9b42c5913 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1e8890bd7a972827bd9449eeb7f76a9b42c5913 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1e8890bd7a972827bd9449eeb7f76a9b42c5913 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1e8890bd7a972827bd9449eeb7f76a9b42c5913 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1e8890bd7a972827bd9449eeb7f76a9b42c5913 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1e8890bd7a972827bd9449eeb7f76a9b42c5913 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1e8890bd7a972827bd9449eeb7f76a9b42c5913 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -139,48 +139,7 @@
 
 
 	<jsp-config>
-
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -99,7 +99,7 @@
 		</label>
 	</div>
 	<div class="form-group">
-		<textarea name="reflectionSubject" id="reflectInstructions" class="form-control" rows="3"></textarea>
+		<textarea name="reflectionSubject" id="reflectInstructions" class="form-control" rows="3">${mcAuthoringForm.reflectionSubject}</textarea>
 	</div>
 </lams:SimplePanel>
 
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -28,8 +28,8 @@
 
 		
 		function submitModifyAuthoringQuestion(questionIndexValue, actionMethod) {
-			document.McAuthoringForm.questionIndex.value=questionIndexValue; 
-			document.McAuthoringForm.dispatch.value=actionMethod;
+			document.forms.McAuthoringForm.questionIndex.value=questionIndexValue; 
+			document.forms.McAuthoringForm.dispatch.value=actionMethod;
 			
 			$('#authoringForm').ajaxSubmit({ 
 				data: { 
@@ -38,7 +38,7 @@
 				target:  $('#resourceListArea'),
 	    		iframe: true,
 	    		success:    function() { 
-	    			document.McAuthoringForm.dispatch.value="submitAllContent";
+	    			document.forms.McAuthoringForm.dispatch.value="submitAllContent";
 	    			refreshThickbox();
 	    	    }
 		    });
@@ -69,8 +69,8 @@
         } 
         
         function doSubmit(method) {
-        	document.McAuthoringForm.dispatch.value=method;
-        	document.McAuthoringForm.submit();
+        	document.forms.McAuthoringForm.dispatch.value=method;
+        	document.forms.McAuthoringForm.submit();
         }
 	</script>
 </lams:head>
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -3,8 +3,8 @@
 
 <script type="text/javascript">
 	function removeQuestion(questionIndex) {
-		document.McAuthoringForm.questionIndex.value=questionIndex;
-		document.McAuthoringForm.dispatch.value='removeQuestion'; 
+		document.forms.McAuthoringForm.questionIndex.value=questionIndex;
+		document.forms.McAuthoringForm.dispatch.value='removeQuestion'; 
 		
 		$('#authoringForm').ajaxSubmit({ 
     		target:  $('#resourceListArea'),
@@ -13,7 +13,7 @@
 			},
     		iframe: true,
     		success:    function() { 
-    			document.McAuthoringForm.dispatch.value="submitAllContent";
+    			document.forms.McAuthoringForm.dispatch.value="submitAllContent";
     			refreshThickbox();
     	    }
 	    });
@@ -35,7 +35,7 @@
     		target:  $('#resourceListArea'),
     		iframe: true,
     		success:    function() { 
-    			document.McAuthoringForm.dispatch.value="submitAllContent";
+    			document.forms.McAuthoringForm.dispatch.value="submitAllContent";
     			refreshThickbox();
     	    	form.remove();
     	    }
@@ -54,7 +54,7 @@
 
 <div class="form-group">
     <label for="title"><fmt:message key="label.authoring.title.col"/></label>
-    <input type="text" name="title" value="MCQ" class="form-control"/>
+    <input type="text" name="title" value="${mcAuthoringForm.title}" class="form-control"/>
 </div>
 
 <div class="form-group">
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -59,14 +59,14 @@
 			}
 				
 			function submitModifyCandidate(candidateIndexValue, actionMethod) {
-				document.McAuthoringForm.candidateIndex.value=candidateIndexValue;
+				document.forms.McAuthoringForm.candidateIndex.value=candidateIndexValue;
 				submitForm(actionMethod);
 			}
 
 			function removeCandidate(candidateIndexValue) {
 				if (validateMinumumCandidateCount()) {
-					document.McAuthoringForm.candidateIndex.value=candidateIndexValue;
-					submitMethod("removeCandidate");
+					document.forms.McAuthoringForm.candidateIndex.value=candidateIndexValue;
+					submitForm("removeCandidate");
 				}
 			}
 	
@@ -80,7 +80,7 @@
 				}
 				
 				var singleCorrectEntry = 0;
-				var radioCorrect=document.McAuthoringForm.correct;
+				var radioCorrect=document.forms.McAuthoringForm.correct;
 				if ((radioCorrect == 'null') || (radioCorrect == 'undefined')) {
 					var msg = "<fmt:message key="candidates.groupSize.warning"/>";
 					alert(msg);
@@ -129,7 +129,7 @@
 			}
 
 			function validateMinumumCandidateCount() {
-				var radioCorrect=document.McAuthoringForm.correct;
+				var radioCorrect=document.forms.McAuthoringForm.correct;
 				if ((radioCorrect == 'undefined') || (radioCorrect == null)) {
 					var msg = "<fmt:message key="candidates.unremovable.groupSize"/>";
 					alert(msg);
@@ -201,7 +201,7 @@
 				<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-default btn-sm roffset5"> 
 					<fmt:message key="label.cancel" />
 				</a>
-				<a href="#" onclick="saveQuestion();"
+				<a href="#" onclick="javascript:submitForm('saveQuestion');"
 					onmousedown="self.focus();" class="btn btn-default btn-sm"> 
 					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.save" />
 				</a>
Index: lams_tool_lamc/web/common/messages.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/web/common/messages.jsp	(.../messages.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/common/messages.jsp	(.../messages.jsp)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -10,13 +10,3 @@
             </lams:Alert>
         </c:if>
         
-<%-- Success Messages --%>
-<logic:messagesPresent message="true">
-    <div class="message" id="successMessages">
-       	<lams:Alert id="errorMessages" type="info" close="false">
-	        <html:messages id="message" message="true">
-            	<c:out value="${message}" escapeXml="false"/><br/>
-    	    </html:messages>
-	    </lams:Alert>
-    </div>
-</logic:messagesPresent>
\ No newline at end of file
Index: lams_tool_lamc/web/common/taglibs.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -1,7 +1,4 @@
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -re1e8890bd7a972827bd9449eeb7f76a9b42c5913
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
@@ -52,22 +52,22 @@
 
         function submitNextQuestionSelected() {
           if (verifyAllQuestionsAnswered()) {
-            ++document.McLearningForm.questionIndex.value;
-            document.McLearningForm.nextQuestionSelected.value = 1;
+            ++document.forms.McLearningForm.questionIndex.value;
+            document.forms.McLearningForm.nextQuestionSelected.value = 1;
             disableContinueButton();
-            document.McLearningForm.submit();
+            document.forms.McLearningForm.submit();
           }
         }
 
         function submitAllAnswers() {
-          document.McLearningForm.continueOptionsCombined.value = 1;			
+          document.forms.McLearningForm.continueOptionsCombined.value = 1;			
           doSubmit();
         }
 
         function doSubmit() {
           if (verifyAllQuestionsAnswered()) {
             disableContinueButton();
-            document.McLearningForm.submit();
+            document.forms.McLearningForm.submit();
           }
         }