Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -r6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed)
@@ -890,6 +890,8 @@
 label.marks=Marks
 authoring.tbl.delete.appex.prompt=Do you want to delete the Application Exercise {0}?
 authoring.tbl.delete.mcq.prompt=Do you want to delete the RAT Question {0}?
+authoring.application.exercise.allow.multiple.responses  =Allow Multiple Responses
+authoring.application.exercise.allow.multiple.responses.tooltip  =When learners are allowed to select multiple answers the grade is the sum of the grade for all correct responses selected.
 
 #QB questions#
 label.create.question  =Create question
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5129d828c41c0731ee7889271cffde6421e2146c -r6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5129d828c41c0731ee7889271cffde6421e2146c)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed)
@@ -889,6 +889,8 @@
 label.marks=Marks
 authoring.tbl.delete.appex.prompt=Do you want to delete the Application Exercise {0}?
 authoring.tbl.delete.mcq.prompt=Do you want to delete the RAT Question {0}?
+authoring.application.exercise.allow.multiple.responses  =Allow Multiple Responses
+authoring.application.exercise.allow.multiple.responses.tooltip  =When learners are allowed to select multiple answers the grade is the sum of the grade for all correct responses selected.
 
 #QB questions#
 label.create.question  =Create question
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -re7cbd533f52ac2a431c09e7272b1f31769258022 -r6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision e7cbd533f52ac2a431c09e7272b1f31769258022)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed)
@@ -341,6 +341,7 @@
 	    int displayOrderOption = 1;
 	    Set<QbOption> qbOptionsToRemove = new HashSet<>(qbQuestion.getQbOptions());
 	    List<McOptionDTO> optionDTOs = questionDTO.getOptionDtos();
+
 	    for (McOptionDTO optionDTO : optionDTOs) {
 
 		String optionText = optionDTO.getCandidateAnswer();
@@ -611,7 +612,7 @@
 	    mcSessionMarkDTO.setSessionId(session.getMcSessionId().toString());
 	    mcSessionMarkDTO.setSessionName(session.getSession_name().toString());
 
-	    Set<McQueUsr> sessionUsers = session.getMcQueUsers();
+	    List<McQueUsr> sessionUsers = session.getMcQueUsers();
 	    Iterator<McQueUsr> usersIterator = sessionUsers.iterator();
 
 	    Map<String, McUserMarkDTO> mapSessionUsersData = new TreeMap<String, McUserMarkDTO>(
@@ -916,7 +917,7 @@
 	Set<McSession> sessionList = content.getMcSessions();
 	for (McSession session : sessionList) {
 	    Long toolSessionId = session.getMcSessionId();
-	    Set<McQueUsr> sessionUsers = session.getMcQueUsers();
+	    List<McQueUsr> sessionUsers = session.getMcQueUsers();
 
 	    for (McQueUsr user : sessionUsers) {
 
@@ -1488,7 +1489,7 @@
 	if (!existsSession(toolSessionId)) {
 	    try {
 		McSession mcSession = new McSession(toolSessionId, new Date(System.currentTimeMillis()),
-			McSession.INCOMPLETE, toolSessionName, mcContent, new TreeSet());
+			McSession.INCOMPLETE, toolSessionName, mcContent, new ArrayList<McQueUsr>());
 
 		mcSessionDAO.saveMcSession(mcSession);
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision 6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed)
@@ -29,7 +29,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TimeZone;
 import java.util.TreeMap;
 
@@ -242,8 +241,8 @@
 	    // forwards to the leaderSelection page
 	    if (groupLeader == null && !mode.equals(ToolAccessMode.TEACHER.toString())) {
 
-		Set<McQueUsr> groupUsers = mcSession.getMcQueUsers();// mcService.getUsersBySession(new
-								     // Long(toolSessionID).longValue());
+		List<McQueUsr> groupUsers = mcSession.getMcQueUsers();// mcService.getUsersBySession(new
+								      // Long(toolSessionID).longValue());
 		request.setAttribute(McAppConstants.ATTR_GROUP_USERS, groupUsers);
 		request.setAttribute(McAppConstants.TOOL_SESSION_ID, toolSessionID);
 		request.setAttribute(McAppConstants.ATTR_CONTENT, mcContent);
Index: lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
===================================================================
diff -u -re0265c3507ca12f61524934309a32092296fe601 -r6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed
--- lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(.../tra.jsp)	(revision e0265c3507ca12f61524934309a32092296fe601)
+++ lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(.../tra.jsp)	(revision 6aa0f9c7abedde6c4c3cc7fe2b0b19176df284ed)
@@ -84,21 +84,21 @@
 	<div class="panel panel-default">
 		<div class="panel-heading">
 			<h4 class="panel-title">
-				Q${i.index+1}) <c:out value="${item.description}" escapeXml="false"/>
+				Q${i.index+1}) <c:out value="${item.qbQuestion.description}" escapeXml="false"/>
 			</h4> 
 		</div>
 		
 		<div class="panel-body">
 			<div class="table-responsive">
 				<table class="table table-striped">
 					<tbody>
-						<c:forEach var="answer" items="${item.answers}" varStatus="j">
+						<c:forEach var="optionDto" items="${item.optionDtos}" varStatus="j">
 							<tr>
 								<td width="5px">
 									${ALPHABET[j.index]}.
 								</td>
 								<td>
-									<c:out value="${answer.description}" escapeXml="false"/>
+									<c:out value="${optionDto.qbOption.name}" escapeXml="false"/>
 								</td>
 							</tr>
 						</c:forEach>