Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r153c59d8375056a983c1bb0bb34044057c7c410a -r646ad3f8f14c7577e5a1e863f31dacca0c38e860
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 153c59d8375056a983c1bb0bb34044057c7c410a)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 646ad3f8f14c7577e5a1e863f31dacca0c38e860)
@@ -314,6 +314,7 @@
     	
     <!--  Each message service created by loadedMessageService is a ResourceBundleMessageSource -->
 	<bean id="loadedMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource" scope="prototype">
+		<property name="defaultEncoding" value="UTF-8" />
 	</bean>
 			
 	<!--  Core Notebook Service -->
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
diff -u -r50e336123ddaab4628f5f94f795340c8e845c6df -r646ad3f8f14c7577e5a1e863f31dacca0c38e860
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision 50e336123ddaab4628f5f94f795340c8e845c6df)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision 646ad3f8f14c7577e5a1e863f31dacca0c38e860)
@@ -9,6 +9,7 @@
 		<property name="messageSource">
 			<bean id="laasseMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.assessment.ApplicationResources</value></property>
+				<property name="defaultEncoding" value="UTF-8" />
 			</bean>
 		</property>										
 	</bean>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
diff -u -r9091ed8c9bae9a48f88622c0c5031af2a39772dc -r646ad3f8f14c7577e5a1e863f31dacca0c38e860
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 9091ed8c9bae9a48f88622c0c5031af2a39772dc)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 646ad3f8f14c7577e5a1e863f31dacca0c38e860)
@@ -59,6 +59,7 @@
 
 	<bean id="lamcMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 		<property name="basename"><value>org.lamsfoundation.lams.tool.mc.ApplicationResources</value></property>
+		<property name="defaultEncoding" value="UTF-8" />
 	</bean>
 	
 	<bean id="lamcMessageService" class="org.lamsfoundation.lams.util.MessageService" >
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -rf27fea8eb6533208beffced8d55e3544857577e8 -r646ad3f8f14c7577e5a1e863f31dacca0c38e860
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 646ad3f8f14c7577e5a1e863f31dacca0c38e860)
@@ -12,6 +12,7 @@
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.qa.ApplicationResources</value></property>
+				<property name="defaultEncoding" value="UTF-8" />
 			</bean>
 		</property>										
 	</bean>
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
===================================================================
diff -u -r0e7d403e91b0916fd3842d8d3098b1c466d28ece -r646ad3f8f14c7577e5a1e863f31dacca0c38e860
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java	(.../PeerreviewUserDAOHibernate.java)	(revision 0e7d403e91b0916fd3842d8d3098b1c466d28ece)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java	(.../PeerreviewUserDAOHibernate.java)	(revision 646ad3f8f14c7577e5a1e863f31dacca0c38e860)
@@ -71,7 +71,7 @@
 
     @Override
     public PeerreviewUser getUserByUid(Long userUid) {
-	return (PeerreviewUser) this.find(PeerreviewUser.class, userUid);
+	return this.find(PeerreviewUser.class, userUid);
     }
 
     @Override
@@ -155,7 +155,8 @@
     @Override
     public List<Object[]> getRatingsComments(Long toolContentId, Long toolSessionId, RatingCriteria criteria,
 	    Long userId, Integer page, Integer size, int sorting, String searchString, boolean getByUser,
-	    IRatingService coreRatingService, IUserManagementService userManagementService) {
+	    boolean includeCurrentUser, IRatingService coreRatingService,
+	    IUserManagementService userManagementService) {
 
 	String sortingOrder = "";
 	switch (sorting) {
@@ -195,6 +196,8 @@
 	bldr.append(FIND_USER_RATINGS_COMMENTS3);
 	if (!getByUser) {
 	    bldr.append("WHERE user.user_id = :userId ");
+	} else if (!includeCurrentUser) {
+	    bldr.append("WHERE user.user_id != :userId ");
 	}
 
 	buildNameSearch(searchString, bldr, !getByUser);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
diff -u -r9091ed8c9bae9a48f88622c0c5031af2a39772dc -r646ad3f8f14c7577e5a1e863f31dacca0c38e860
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision 9091ed8c9bae9a48f88622c0c5031af2a39772dc)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision 646ad3f8f14c7577e5a1e863f31dacca0c38e860)
@@ -9,6 +9,7 @@
 		<property name="messageSource">
 			<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 				<property name="basename"><value>org.lamsfoundation.lams.tool.scratchie.ApplicationResources</value></property>
+				<property name="defaultEncoding" value="UTF-8" />
 			</bean>
 		</property>										
 	</bean>