Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java
===================================================================
diff -u -r7f0968bf243209b9fc78a0f8f4d4b3bdbc3b7649 -rb749eaf5465cf318976a6e036293ed9fded85434
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java	(.../AssessmentQuestionResultDAO.java)	(revision 7f0968bf243209b9fc78a0f8f4d4b3bdbc3b7649)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java	(.../AssessmentQuestionResultDAO.java)	(revision b749eaf5465cf318976a6e036293ed9fded85434)
@@ -32,7 +32,10 @@
     
     int getNumberWrongAnswersDoneBefore(Long assessmentUid, Long userId, Long questionUid);
     
-    List<AssessmentQuestionResult> getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid);
+    /**
+     * Returns array, first element is AssessmentQuestionResult, second - according AssessmentResult
+     */
+    List<Object[]> getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid);
     
     AssessmentQuestionResult getAssessmentQuestionResultByUid(Long questionResultUid);
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
===================================================================
diff -u -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9 -rb749eaf5465cf318976a6e036293ed9fded85434
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java	(.../AssessmentQuestionResultDAOHibernate.java)	(revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java	(.../AssessmentQuestionResultDAOHibernate.java)	(revision b749eaf5465cf318976a6e036293ed9fded85434)
@@ -57,7 +57,7 @@
 	}
     }
 
-    public List<AssessmentQuestionResult> getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid) {
+    public List<Object[]> getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid) {
 	return getHibernateTemplate().find(FIND_BY_ASSESSMENT_QUESTION_AND_USER, new Object[] { assessmentUid, userId, questionUid });
     }
     
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
===================================================================
diff -u -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30 -rb749eaf5465cf318976a6e036293ed9fded85434
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision b749eaf5465cf318976a6e036293ed9fded85434)
@@ -115,7 +115,7 @@
     
     private Set<AssessmentQuestionOption> matchingPairOptions;
     
-    private List<AssessmentQuestionResult> questionResults;
+    private List<Object[]> questionResults;
     
     public AssessmentQuestion() {
 	questionOptions = new TreeSet<AssessmentQuestionOption>(new SequencableComparator());
@@ -550,10 +550,10 @@
 	this.matchingPairOptions = matchingPairOptions;
     }
     
-    public List<AssessmentQuestionResult> getQuestionResults() {
+    public List<Object[]> getQuestionResults() {
 	return questionResults;
     }
-    public void setQuestionResults(List<AssessmentQuestionResult> questionResults) {
-	this.questionResults = questionResults;
+    public void setQuestionResults(List<Object[]> questionResults2) {
+	this.questionResults = questionResults2;
     }
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -raee0c08639547cfdf353db8f22c4aedf22092787 -rb749eaf5465cf318976a6e036293ed9fded85434
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision aee0c08639547cfdf353db8f22c4aedf22092787)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision b749eaf5465cf318976a6e036293ed9fded85434)
@@ -538,7 +538,7 @@
     }
 
     @Override
-    public List<AssessmentQuestionResult> getAssessmentQuestionResultList(Long assessmentUid, Long userId,
+    public List<Object[]> getAssessmentQuestionResultList(Long assessmentUid, Long userId,
 	    Long questionUid) {
 	return assessmentQuestionResultDao.getAssessmentQuestionResultList(assessmentUid, userId, questionUid);
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
diff -u -r7817bc4fce30416c9737875ae2d137be0c6aa8ba -rb749eaf5465cf318976a6e036293ed9fded85434
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 7817bc4fce30416c9737875ae2d137be0c6aa8ba)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision b749eaf5465cf318976a6e036293ed9fded85434)
@@ -187,7 +187,7 @@
     
     int getAssessmentResultCount(Long assessmentUid, Long userId);
     
-    List<AssessmentQuestionResult> getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid);
+    List<Object[]> getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid);
     
     Long createNotebookEntry(Long sessionId, Integer userId, String entryText);
     
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -r7817bc4fce30416c9737875ae2d137be0c6aa8ba -rb749eaf5465cf318976a6e036293ed9fded85434
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 7817bc4fce30416c9737875ae2d137be0c6aa8ba)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision b749eaf5465cf318976a6e036293ed9fded85434)
@@ -645,8 +645,8 @@
 			    }
 			}
 
-			List<AssessmentQuestionResult> questionResults = service.getAssessmentQuestionResultList(
-				assessment.getUid(), userId, question.getUid());
+			List<Object[]> questionResults = service.getAssessmentQuestionResultList(assessment.getUid(),
+				userId, question.getUid());
 			question.setQuestionResults(questionResults);
 		    }
 		}
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -raab18261022d7746e10b3651bd3c864356c58a8b -rb749eaf5465cf318976a6e036293ed9fded85434
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision aab18261022d7746e10b3651bd3c864356c58a8b)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision b749eaf5465cf318976a6e036293ed9fded85434)
@@ -400,20 +400,24 @@
 	    return;
 	}
 	
-	ScratchieUser user = this.getUserByIDAndSession(userId, sessionId);
-	int oldMark = user.getMark();
+	ScratchieUser leader = this.getUserByIDAndSession(userId, sessionId);
+	int oldMark = leader.getMark();
 	
-	user.setMark(newMark);
-	this.saveUser(user);
+	//When changing a mark for leader, the mark should be propagated to all students within the group
+	List<ScratchieUser> users = this.getUsersBySession(leader.getSession().getSessionId());
+	for (ScratchieUser user : users) {
+	    user.setMark(newMark);
+	    this.saveUser(user);
 
-	// propagade changes to Gradebook
-	gradebookService.updateActivityMark(new Double(newMark), null, user.getUserId().intValue(), user.getSession()
-		.getSessionId(), true);
-	
-	//record mark change with audit service
-	auditService.logMarkChange(ScratchieConstants.TOOL_SIGNATURE, user.getUserId(), user.getLoginName(), ""
-		+ oldMark, "" + newMark);
+	    // propagade changes to Gradebook
+	    gradebookService.updateActivityMark(new Double(newMark), null, user.getUserId().intValue(), user
+		    .getSession().getSessionId(), true);
 
+	    // record mark change with audit service
+	    auditService.logMarkChange(ScratchieConstants.TOOL_SIGNATURE, user.getUserId(), user.getLoginName(), ""
+		    + oldMark, "" + newMark);
+	}
+
     }
 
     @Override