Index: lams_admin/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_admin/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_admin/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_central/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_central/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_central/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_gradebook/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_gradebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_gradebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_learning/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_learning/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_learning/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_monitoring/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_monitoring/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_monitoring/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_chat/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_chat/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_chat/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_daco/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_daco/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_daco/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_doku/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_doku/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_doku/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_forum/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_forum/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_forum/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_images/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_images/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_images/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_leader/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_nb/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_nb/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_nb/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_preview/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_preview/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_preview/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_survey/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_survey/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_survey/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_task/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_task/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_task/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_vote/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_vote/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_vote/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_tool_zoom/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_tool_zoom/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_tool_zoom/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
Index: lams_www/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd32a0f2e3c1419280e584a7f9ff87d991b0ba9ff -r45767de2475ee5949c0054ba5ead0a777372c67b
--- lams_www/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d32a0f2e3c1419280e584a7f9ff87d991b0ba9ff)
+++ lams_www/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 45767de2475ee5949c0054ba5ead0a777372c67b)
@@ -249,12 +249,13 @@
 			<table class="table table-bordered rubrics-table">
 				<tr>
 					<%-- Each answer column has the same length, all remaining space is taken by the question column --%>
-					<th class="col-xs-${12 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
+					<th class="col-xs-${11 - fn:length(criteriaRatings.ratingCriteria.rubricsColumnHeaders) * 2}"></th>
 					<c:forEach var="columnHeader" items="${criteriaRatings.ratingCriteria.rubricsColumnHeaders}" varStatus="columnStatus">
 						<th class="col-xs-2">
 							(${columnStatus.count})&nbsp;<c:out value="${columnHeader}" escapeXml="false"/>
 						</th>
 					</c:forEach>
+					<th class="col-xs-1 text-center"><fmt:message key="label.average" /></th>
 				</tr>
 				<c:forEach var="criteriaDto" items="${criteriaRatings.criteriaGroup}">
 					<c:set var="criteria" value="${criteriaDto.ratingCriteria}" />
@@ -263,13 +264,19 @@
 						<td rowspan="2">
 							<c:out value="${criteria.title}" escapeXml="false" />
 						</td>
+						
+						<%-- These variables are for counting average rating for the given row --%>
+						<c:set var="rowRateCount" value="0" />
+						<c:set var="rowRateValue" value="0" />
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">
 							
 							<%-- Check if any other learner rated this learner for this column --%>
 							<c:set var="rateCount" value="0" />
 							<c:forEach var="ratingDto" items="${criteriaDto.ratingDtos}">
-								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count? 1 : 0)}" />
+								<c:set var="rateCount" value="${rateCount + (ratingDto.userRating eq columnOrderId.count ? 1 : 0)}" />
 							</c:forEach>
+							<c:set var="rowRateCount" value="${rowRateCount + rateCount}" />
+							<c:set var="rowRateValue" value="${rowRateValue + rateCount * columnOrderId.count}" />
 							
 							<td class="rubrics-description-cell
 								<c:if test="${rateCount > 0}">
@@ -280,6 +287,18 @@
 								<c:out value="${column.name}" escapeXml="false" />
 							</td>
 						</c:forEach>
+						
+						<%-- Cell with average rating --%>
+						<td rowspan="2" class="text-center">
+							<c:choose>
+								<c:when test="${rowRateCount eq 0}">
+									-
+								</c:when>
+								<c:otherwise>
+									<fmt:formatNumber value="${rowRateValue / rowRateCount}" type="number" maxFractionDigits="2" />
+								</c:otherwise>
+							</c:choose>
+						</td>
 					</tr>
 					<tr>
 						<c:forEach var="column" items="${criteria.rubricsColumns}" varStatus="columnOrderId">