Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -148,8 +148,15 @@
         length="1"
     />
     
+    <property
+        name="showOtherAnswers"
+        type="boolean"
+        access="property"        
+        column="showOtherAnswers"
+        length="1"
+    />
+
     
-    
     <property
         name="offlineInstructions"
         type="java.lang.String"
Index: lams_tool_laqa/db/model/lams_tool_qa.clay
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/db/model/lams_tool_qa.clay	(.../lams_tool_qa.clay)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/db/model/lams_tool_qa.clay	(.../lams_tool_qa.clay)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -95,7 +95,7 @@
 </table>
 <table alias="" name="tl_laqa11_content" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="261" width="211" x="96" y="408"/>
+<table-figure-bounds height="271" width="211" x="96" y="408"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -272,7 +272,20 @@
 <column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="1" mandatory="true" name="lockWhenFinished" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
 <variant type-name-pattern="TINYINT"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
+<variant type-name-pattern="TINYINT UNSIGNED"/>
+<variant type-name-pattern="TINYINT UNSIGNED ZEROFILL"/>
+<variant type-name-pattern="TINYINT ZEROFILL"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="1" mandatory="true" name="showOtherAnswers" remarks="">
+<column-description></column-description>
+<data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
+<variant type-name-pattern="TINYINT"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -1,26 +1,3 @@
--- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
--- =============================================================
--- License Information: http://lamsfoundation.org/licensing/lams/2.0/
---
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License version 2.0 as
--- published by the Free Software Foundation.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301-- USA
---
--- http://www.gnu.org/licenses/gpl.txt
--- ****************************************************************
---
--- $Id$
-
-
 CREATE TABLE tl_laqa11_content (
        uid BIGINT(20) NOT NULL AUTO_INCREMENT
      , qa_content_id BIGINT(20) NOT NULL
@@ -40,6 +17,7 @@
      , content_inUse TINYINT(1) DEFAULT 0
      , reflectionSubject TEXT
      , lockWhenFinished TINYINT(1) NOT NULL DEFAULT 1
+     , showOtherAnswers TINYINT(1) NOT NULL DEFAULT 1
      , PRIMARY KEY (uid)
 )TYPE=InnoDB;
 
@@ -113,6 +91,7 @@
                   REFERENCES tl_laqa11_content (uid)
 )TYPE=InnoDB;
 
+
 -- data for content table
 INSERT INTO tl_laqa11_content (qa_content_id, title, instructions, creation_date, lockWhenFinished)  VALUES (${default_content_id}, 'Q&A', 'Instructions', NOW() , 1);
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
===================================================================
diff -u -rc57ff53dca1350c876aed0ab150fbe0411b2d44f -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	(.../GeneralLearnerFlowDTO.java)	(revision c57ff53dca1350c876aed0ab150fbe0411b2d44f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	(.../GeneralLearnerFlowDTO.java)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -81,6 +81,8 @@
     
     protected String userNameVisible;
     
+    protected String showOtherAnswers;
+    
 	protected String requestLearningReport;
 
 	protected String requestLearningReportProgress;
@@ -569,4 +571,16 @@
     public void setLockWhenFinished(String lockWhenFinished) {
         this.lockWhenFinished = lockWhenFinished;
     }
+    /**
+     * @return Returns the showOtherAnswers.
+     */
+    public String getShowOtherAnswers() {
+        return showOtherAnswers;
+    }
+    /**
+     * @param showOtherAnswers The showOtherAnswers to set.
+     */
+    public void setShowOtherAnswers(String showOtherAnswers) {
+        this.showOtherAnswers = showOtherAnswers;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
===================================================================
diff -u -rc57ff53dca1350c876aed0ab150fbe0411b2d44f -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision c57ff53dca1350c876aed0ab150fbe0411b2d44f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java	(.../QaContent.java)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -101,6 +101,8 @@
     
     private boolean lockWhenFinished;
     
+    private boolean showOtherAnswers;
+    
     /** nullable persistent field */
     private boolean usernameVisible;
     
@@ -145,6 +147,7 @@
 	                 boolean 	synchInMonitor,
 	                 boolean 	lockWhenFinished,
 	                 boolean 	contentLocked,
+	                 boolean	showOtherAnswers,
 	                 boolean 	reflect,
 	                 String 	reflectionSubject,
 	                 Date		creationDate,
@@ -169,6 +172,7 @@
         this.synchInMonitor 	 = synchInMonitor;
         this.lockWhenFinished 	 = lockWhenFinished;
         this.contentLocked		 = contentLocked;
+        this.showOtherAnswers	 = showOtherAnswers;
         this.reflect		 	 = reflect;
         this.reflectionSubject	 =reflectionSubject;
         this.creationDate 		 = creationDate;
@@ -207,14 +211,15 @@
                      qa.isSynchInMonitor(),
                      qa.isLockWhenFinished(),
 					 qa.isContentLocked(),
+					 qa.isShowOtherAnswers(),
 					 qa.isReflect(),
 					 qa.getReflectionSubject(),
                      qa.getCreationDate(),
                      qa.getUpdateDate(),
 					 new TreeSet(),
 					 new TreeSet(),
                      new TreeSet());
-    	logger.debug(logger + " " + "QaContent" +  " " + "before doing deepCopyQaQueContent");
+
     	newContent.setQaQueContents(qa.deepCopyQaQueContent(newContent));
     	logger.debug(logger + " " + "QaContent" +  " " + "after doing deepCopyQaQueContent");
 
@@ -607,4 +612,18 @@
     public void setLockWhenFinished(boolean lockWhenFinished) {
         this.lockWhenFinished = lockWhenFinished;
     }
+    
+    /**
+     * @return Returns the showOtherAnswers.
+     */
+    public boolean isShowOtherAnswers() {
+        return showOtherAnswers;
+    }
+    /**
+     * @param showOtherAnswers The showOtherAnswers to set.
+     */
+    public void setShowOtherAnswers(boolean showOtherAnswers) {
+        this.showOtherAnswers = showOtherAnswers;
+    }
+    
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java
===================================================================
diff -u -rc57ff53dca1350c876aed0ab150fbe0411b2d44f -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java	(.../QaGeneralAuthoringDTO.java)	(revision c57ff53dca1350c876aed0ab150fbe0411b2d44f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java	(.../QaGeneralAuthoringDTO.java)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -54,6 +54,7 @@
     protected String onlineInstructions;
     protected String offlineInstructions;
     protected String usernameVisible;
+    protected String showOtherAnswers;
     protected String reflect;
     protected String synchInMonitor;
     protected String questionsSequenced;
@@ -99,6 +100,7 @@
             .append("onlineInstructions: ", onlineInstructions)
             .append("offlineInstructions: ", offlineInstructions)
             .append("usernameVisible: ", usernameVisible)
+            .append("showOtherAnswers: ", showOtherAnswers)
             .append("synchInMonitor: ", synchInMonitor)
             .append("questionsSequenced: ", questionsSequenced)
             .append("lockWhenFinished: ", lockWhenFinished)
@@ -527,4 +529,16 @@
     public void setLockWhenFinished(String lockWhenFinished) {
         this.lockWhenFinished = lockWhenFinished;
     }
+    /**
+     * @return Returns the showOtherAnswers.
+     */
+    public String getShowOtherAnswers() {
+        return showOtherAnswers;
+    }
+    /**
+     * @param showOtherAnswers The showOtherAnswers to set.
+     */
+    public void setShowOtherAnswers(String showOtherAnswers) {
+        this.showOtherAnswers = showOtherAnswers;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
diff -u -rc57ff53dca1350c876aed0ab150fbe0411b2d44f -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision c57ff53dca1350c876aed0ab150fbe0411b2d44f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -115,6 +115,13 @@
 		qaAuthoringForm.setUsernameVisible(usernameVisible);
 		qaGeneralAuthoringDTO.setUsernameVisible(usernameVisible);
 		
+
+		String showOtherAnswers=request.getParameter("showOtherAnswers");
+		logger.debug("showOtherAnswers: " + showOtherAnswers);
+		qaAuthoringForm.setShowOtherAnswers(showOtherAnswers);
+		qaGeneralAuthoringDTO.setShowOtherAnswers(showOtherAnswers);
+		
+		
 		String questionsSequenced=request.getParameter(QUESTIONS_SEQUENCED);
 		logger.debug("questionsSequenced: " + questionsSequenced);
 		qaAuthoringForm.setQuestionsSequenced(questionsSequenced);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -450,6 +450,9 @@
 		String usernameVisible=request.getParameter(USERNAME_VISIBLE);
 		logger.debug("usernameVisible: " + usernameVisible);
 		
+		String showOtherAnswers=request.getParameter("showOtherAnswers");
+		logger.debug("showOtherAnswers: " + showOtherAnswers);
+		
 		String questionsSequenced=request.getParameter(QUESTIONS_SEQUENCED);
 		logger.debug("questionsSequenced: " + questionsSequenced);
 		
@@ -471,7 +474,7 @@
         
         boolean setCommonContent=true; 
         if ((questionsSequenced == null) || (synchInMonitor == null) || (lockWhenFinished == null) || 
-             (usernameVisible == null) || (reflect == null))
+             (usernameVisible == null) || (reflect == null) || (showOtherAnswers == null))
         {
         	setCommonContent=false;
         }
@@ -481,6 +484,7 @@
         boolean synchInMonitorBoolean=false;
         boolean lockWhenFinishedBoolean=false;
         boolean usernameVisibleBoolean=false;
+        boolean showOtherAnswersBoolean=false;
         boolean reflectBoolean=false;
 
     	if ((questionsSequenced != null) && (questionsSequenced.equalsIgnoreCase("1")))
@@ -495,6 +499,10 @@
         if ((usernameVisible != null) && (usernameVisible.equalsIgnoreCase("1")))
             usernameVisibleBoolean=true;            
 
+        if ((showOtherAnswers != null) && (showOtherAnswers.equalsIgnoreCase("1")))
+            showOtherAnswersBoolean=true;            
+
+        
         if ((reflect != null) && (reflect.equalsIgnoreCase("1")))
             reflectBoolean=true;
             
@@ -503,6 +511,7 @@
         logger.debug("synchInMonitorBoolean: " + synchInMonitorBoolean);
         logger.debug("lockWhenFinishedBoolean: " + lockWhenFinishedBoolean);
         logger.debug("usernameVisibleBoolean: " + usernameVisibleBoolean);
+        logger.debug("showOtherAnswersBoolean: " + showOtherAnswersBoolean);
         logger.debug("reflectBoolean: " + reflectBoolean);
         
         long userId=0;
@@ -555,6 +564,7 @@
          	qaContent.setOnlineInstructions(richTextOnlineInstructions);
          	qaContent.setOfflineInstructions(richTextOfflineInstructions);
          	qaContent.setUsernameVisible(usernameVisibleBoolean);
+         	qaContent.setShowOtherAnswers(showOtherAnswersBoolean);
          	qaContent.setQuestionsSequenced(questionsSequencedBoolean);
          	qaContent.setLockWhenFinished(lockWhenFinishedBoolean);
          	qaContent.setSynchInMonitor(synchInMonitorBoolean);	
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -94,7 +94,8 @@
             generalLearnerFlowDTO.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
         
         
-        generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString()); 
+        generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
+        generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString());
         generalLearnerFlowDTO.setActivityOffline(new Boolean(qaContent.isRunOffline()).toString());
         
         logger.debug("continue buildGeneralLearnerFlowDTO: " + qaContent);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java	(.../QaAuthoringForm.java)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java	(.../QaAuthoringForm.java)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -74,6 +74,7 @@
 	protected String monitoringReportTitle;
 	protected String endLearningMessage;
 	protected String usernameVisible;
+	protected String showOtherAnswers;
 	protected String questionsSequenced;
 	protected String lockWhenFinished;
 	protected String reflect;
@@ -180,6 +181,7 @@
             .append("onlineInstructions: ", onlineInstructions)
             .append("offlineInstructions: ", offlineInstructions)
             .append("usernameVisible: ", usernameVisible)
+            .append("showOtherAnswers: ", showOtherAnswers)
             .append("synchInMonitor: ", synchInMonitor)
             .append("questionsSequenced: ", questionsSequenced)
             .append("lockWhenFinished: ", lockWhenFinished)
@@ -760,4 +762,16 @@
     public void setLockWhenFinished(String lockWhenFinished) {
         this.lockWhenFinished = lockWhenFinished;
     }
+    /**
+     * @return Returns the showOtherAnswers.
+     */
+    public String getShowOtherAnswers() {
+        return showOtherAnswers;
+    }
+    /**
+     * @param showOtherAnswers The showOtherAnswers to set.
+     */
+    public void setShowOtherAnswers(String showOtherAnswers) {
+        this.showOtherAnswers = showOtherAnswers;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
diff -u -r90d2d1906a8ed6088f190f7c4475437287d17ba6 -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 90d2d1906a8ed6088f190f7c4475437287d17ba6)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -273,6 +273,12 @@
 	    logger.debug("lockWhenFinished: " + lockWhenFinished);
 	    generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString());
 
+	    boolean showOtherAnswers=qaContent.isShowOtherAnswers();  
+	    logger.debug("showOtherAnswers: " + showOtherAnswers);
+	    generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(showOtherAnswers).toString());
+	    
+	    generalLearnerFlowDTO.setReflection(new Boolean(qaContent.isReflect()).toString());
+	    
 	    request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
     	
     	qaLearningForm.resetAll();
@@ -373,6 +379,7 @@
 	    
 	    logger.debug("IS_USERNAME_VISIBLE: " + qaContent.isUsernameVisible());
 	    generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
+	    generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString());
 
 
 	    /*
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -328,8 +328,8 @@
 	    
 	    logger.debug("IS_USERNAME_VISIBLE: " + qaContent.isUsernameVisible());
 	    generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
+	    generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString());
 	    
-	    
 	    /*
 	     * Is the tool activity been checked as Define Later in the property inspector?
 	     */
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -418,6 +418,7 @@
 		QaUtils.populateAuthoringDTO(request, qaContent, qaGeneralAuthoringDTO);
 		
 	    qaAuthoringForm.setUsernameVisible(qaContent.isUsernameVisible()?"1":"0");
+	    qaAuthoringForm.setShowOtherAnswers(qaContent.isShowOtherAnswers()?"1":"0");
 	    qaAuthoringForm.setSynchInMonitor(qaContent.isSynchInMonitor()?"1":"0");	    
 	    qaAuthoringForm.setQuestionsSequenced(qaContent.isQuestionsSequenced()?"1":"0");
 	    qaAuthoringForm.setLockWhenFinished(qaContent.isLockWhenFinished()?"1":"0");
Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -21,14 +21,23 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <p class="small-space-top">
-	<html:checkbox property="usernameVisible" value="1" styleId="usernameVisible"
+	<html:checkbox property="showOtherAnswers" value="1" styleId="showOtherAnswers" onclick="updateUsernameVisible(this);"
 		styleClass="noBorder">
 	</html:checkbox>
+	<label for="showOtherAnswers">
+		<fmt:message key="label.learner.answers" />
+	</label>
+
+	<br>	
+	&nbsp&nbsp<html:checkbox property="usernameVisible" value="1" styleId="usernameVisible"
+		styleClass="noBorder">
+	</html:checkbox>
 	<label for="usernameVisible">
-		<fmt:message key="radiobox.usernameVisible" />
+		<fmt:message key="label.show.names" />
 	</label>
 </p>
 
+
 <p>
 	<html:checkbox property="reflect" value="1" styleClass="noBorder" styleId="reflect">
 	</html:checkbox>
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -race8b408295af831e2715b2013d64a000aa09549 -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision ace8b408295af831e2715b2013d64a000aa09549)
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -95,6 +95,16 @@
         	document.QaAuthoringForm.dispatch.value=method;
         	document.QaAuthoringForm.submit();
         }
+        
+
+		function updateUsernameVisible(clickedObj){
+			if(clickedObj.checked){
+				document.QaAuthoringForm.usernameVisible.checked=true;
+			}else{
+				document.QaAuthoringForm.usernameVisible.checked=false;			
+			}
+		}
+
 	</script>
 </head>
 
Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -107,7 +107,7 @@
 	<c:if
 		test="${qaGeneralAuthoringDTO.activeModule == 'authoring' || qaGeneralAuthoringDTO.activeModule == 'defineLater'}">
 		<a
-			href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newQuestionBox&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&lockWhenFinished=${qaGeneralAuthoringDTO.lockWhenFinished}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}"/>');"
+			href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newQuestionBox&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&showOtherAnswers=${qaGeneralAuthoringDTO.showOtherAnswers}&lockWhenFinished=${qaGeneralAuthoringDTO.lockWhenFinished}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}"/>');"
 			class="button-add-item"> <fmt:message
 				key="label.add.new.question" /> </a>
 
Index: lams_tool_laqa/web/authoring/InstructionsContent.jsp
===================================================================
diff -u -r47ed08dc3daff962ae3af84bef5d38bb531eeabb -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 47ed08dc3daff962ae3af84bef5d38bb531eeabb)
+++ lams_tool_laqa/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -54,7 +54,7 @@
 							</html:link>
 							&nbsp
 							<html:link
-								page="/authoring.do?dispatch=deleteFile&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&lockWhenFinished=${qaGeneralAuthoringDTO.lockWhenFinished}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}&reflect=${qaGeneralAuthoringDTO.reflect}&reflectionSubject=${qaGeneralAuthoringDTO.reflectionSubject}"
+								page="/authoring.do?dispatch=deleteFile&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&showOtherAnswers=${qaGeneralAuthoringDTO.showOtherAnswers}&lockWhenFinished=${qaGeneralAuthoringDTO.lockWhenFinished}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}&reflect=${qaGeneralAuthoringDTO.reflect}&reflectionSubject=${qaGeneralAuthoringDTO.reflectionSubject}"
 								paramId="uuid" paramName="attachment" paramProperty="uuid"
 								onclick="javascript:return confirm('Are you sure you want to delete this file?')"
 								target="_self">
@@ -119,7 +119,7 @@
 							</html:link>
 							&nbsp&nbsp
 							<html:link
-								page="/authoring.do?dispatch=deleteFile&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}&reflect=${qaGeneralAuthoringDTO.reflect}&reflectionSubject=${qaGeneralAuthoringDTO.reflectionSubject}"
+								page="/authoring.do?dispatch=deleteFile&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&showOtherAnswers=${qaGeneralAuthoringDTO.showOtherAnswers}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}&reflect=${qaGeneralAuthoringDTO.reflect}&reflectionSubject=${qaGeneralAuthoringDTO.reflectionSubject}"
 								paramId="uuid" paramName="attachment" paramProperty="uuid"
 								onclick="javascript:return confirm('Are you sure you want to delete this file?')"
 								target="_self">
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r90d2d1906a8ed6088f190f7c4475437287d17ba6 -r1046868d6997114f3b043778a68b371e03182faf
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 90d2d1906a8ed6088f190f7c4475437287d17ba6)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 1046868d6997114f3b043778a68b371e03182faf)
@@ -124,7 +124,7 @@
 
 			</div>
 
-			<c:if test="${generalLearnerFlowDTO.lockWhenFinished == 'true'}">
+			<c:if test="${(generalLearnerFlowDTO.lockWhenFinished == 'true')  && (generalLearnerFlowDTO.showOtherAnswers == 'true') }">
 				<p>
 					<fmt:message key="label.responses.locked" />
 				</p>
@@ -139,13 +139,34 @@
 
 
 
+			<c:if test="${generalLearnerFlowDTO.showOtherAnswers == 'true'}">
 				<html:button property="viewAllResults"
 					onclick="submitMethod('viewAllResults');" styleClass="button">
 					<fmt:message key="label.allResponses" />
 				</html:button>
-			</div>
+			</c:if>				
 
+			<c:if test="${generalLearnerFlowDTO.showOtherAnswers != 'true'}">
+				<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
+					<html:button property="endLearning"
+						onclick="javascript:submitMethod('endLearning');"
+						styleClass="button">
+						<fmt:message key="button.endLearning" />
+					</html:button>
+				</c:if>
 
+				<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
+					<html:button property="forwardtoReflection"
+						onclick="javascript:submitMethod('forwardtoReflection');"
+						styleClass="button">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</c:if>
+			</c:if>				
+			
+			
+			</div>
+
 		</html:form>
 	</div>