Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
diff -u -r44120a6df157dd073c610ffd29566919c89cce22 -r0120babf4ee377217a385ca28e4f6202b4b4dbf6
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 44120a6df157dd073c610ffd29566919c89cce22)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 0120babf4ee377217a385ca28e4f6202b4b4dbf6)
@@ -34,8 +34,8 @@
 	<!--question content goes here-->
 			<tr> <td>
 			<table class="forms">
-				<c:forEach var="questionEntry" items="${mcGeneralLearnerFlowDTO.mapQuestionContentLearner}">
-			  		<c:if test="${questionEntry.key == mcGeneralLearnerFlowDTO.currentQuestionIndex}"> 			
+				<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
+			  		<c:if test="${questionEntry.key == generalLearnerFlowDTO.currentQuestionIndex}"> 			
 					  <tr>
 						<td colspan=2 NOWRAP> 
 					  		<b> <bean:message key="label.question"/> 
@@ -47,7 +47,7 @@
 					  <tr> 
 						<td NOWRAP>  <b> <bean:message key="label.answer"/> </b> </td>
 						<td NOWRAP>
-				 			<html:text property="answer" size="60" maxlength="255" value="${mcGeneralLearnerFlowDTO.currentAnswer}"/>
+				 			<html:text property="answer" size="60" maxlength="255" value="${generalLearnerFlowDTO.currentAnswer}"/>
 				 			<html:hidden property="currentQuestionIndex" value="${questionEntry.key}"/>
 				 		</td>
 				  	  </tr>
@@ -59,8 +59,8 @@
 			<table class="forms">
 				<tr>
 				<c:choose>  
-				  <c:when test="${(mcGeneralLearnerFlowDTO.currentQuestionIndex == mcGeneralLearnerFlowDTO.totalQuestionCount) && 
-				  				  (sessionScope.totalQuestionCount != 1) }"> 
+				  <c:when test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
+				  				  (generalLearnerFlowDTO.totalQuestionCount != 1) }"> 
 					<td NOWRAP>
 						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<bean:message key="button.getPreviousQuestion"/>
@@ -71,8 +71,8 @@
 					</td> 
 				  </c:when> 
 
-  				  <c:when test="${(mcGeneralLearnerFlowDTO.currentQuestionIndex == mcGeneralLearnerFlowDTO.totalQuestionCount) && 
-				  				  (mcGeneralLearnerFlowDTO.totalQuestionCount == 1) }"> 
+  				  <c:when test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
+				  				  (generalLearnerFlowDTO.totalQuestionCount == 1) }"> 
 					 <td NOWRAP valign=top> 
 						<html:submit onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
 									<bean:message key="button.done"/>
@@ -81,8 +81,8 @@
 				  </c:when> 
 				  
 				  
- 				  <c:when test="${mcGeneralLearnerFlowDTO.currentQuestionIndex != mcGeneralLearnerFlowDTO.totalQuestionCount && 
-				 				  mcGeneralLearnerFlowDTO.currentQuestionIndex > 1}"> 
+ 				  <c:when test="${generalLearnerFlowDTO.currentQuestionIndex != generalLearnerFlowDTO.totalQuestionCount && 
+				 				  generalLearnerFlowDTO.currentQuestionIndex > 1}"> 
 					 <td NOWRAP valign=top> 
 						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<bean:message key="button.getPreviousQuestion"/>