Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -151,11 +151,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
 
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -202,6 +197,12 @@
             <taglib-uri>csrfguard</taglib-uri>
             <taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
         </taglib>
+        
+       <jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 	</jsp-config>
 
 	<!-- Security Constraint -->
Index: lams_gradebook/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_gradebook/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_gradebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -159,12 +159,7 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-		
+
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -209,7 +204,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
-
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 	</jsp-config>
 
 	<!-- Security Constraint -->
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -134,12 +134,7 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
+
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -177,7 +172,12 @@
 			<taglib-uri>tags-lams</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
 		</taglib>
-
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 	</jsp-config>
 
 	<!-- Security Constraint -->
Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -109,12 +109,7 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
+
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -159,7 +154,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
-
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 	</jsp-config>
 
 	<!-- Security Constraint -->
Index: lams_tool_assessment/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -131,12 +131,7 @@
 	</servlet-mapping>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
+
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -170,7 +165,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
-
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 	</jsp-config>
 
 	<!-- Security Constraint -->
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -141,12 +141,7 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
+
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -191,6 +186,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_daco/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_daco/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -133,12 +133,6 @@
 
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -172,6 +166,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_doku/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -131,12 +131,6 @@
 	</servlet-mapping>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -170,6 +164,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -144,12 +144,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -195,6 +189,12 @@
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
 		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
+		
 	</jsp-config>
 
 	<!-- Security Constraint -->
Index: lams_tool_images/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_images/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -131,12 +131,7 @@
 
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
+
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -170,6 +165,12 @@
             <taglib-uri>csrfguard</taglib-uri>
             <taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
         </taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 	</jsp-config>
 
 	<!-- Security Constraint -->
Index: lams_tool_imscc/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -143,12 +143,6 @@
 	</servlet-mapping>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -182,6 +176,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -147,12 +147,7 @@
 
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
+
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -202,6 +197,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -148,12 +148,6 @@
 		<!ELEMENT error-page ((error-code | exception-type), location)> -->
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -203,6 +197,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_larsrc/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_larsrc/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -150,12 +150,7 @@
 	</servlet-mapping>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
+
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -189,6 +184,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_leader/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -127,12 +127,7 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
+
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -177,6 +172,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_mindmap/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_mindmap/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_mindmap/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -148,12 +148,7 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
+
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -198,6 +193,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -131,12 +131,7 @@
 
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-		
+
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -184,6 +179,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_notebook/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -140,11 +140,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
 
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -190,6 +185,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_pixlr/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_pixlr/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_pixlr/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -139,11 +139,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
 
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -189,6 +184,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_preview/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_preview/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_preview/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -143,11 +143,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
 
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -193,6 +188,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_sbmt/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_sbmt/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -143,12 +143,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -193,6 +187,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_scratchie/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -147,12 +147,6 @@
 	</servlet-mapping>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -186,6 +180,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_scribe/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_scribe/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -140,11 +140,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
 
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -190,6 +185,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_spreadsheet/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_spreadsheet/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -134,12 +134,6 @@
 
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
-  		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
@@ -173,6 +167,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_survey/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_survey/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -140,11 +140,6 @@
 
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
   		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -179,7 +174,13 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
-
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
+  		
 	</jsp-config>
 
 	<!-- Security Constraint -->
Index: lams_tool_task/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_task/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -132,11 +132,6 @@
 
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
   		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -183,6 +178,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_vote/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_vote/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -154,11 +154,6 @@
 		<!ELEMENT error-page ((error-code | exception-type), location)> -->
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
 
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -208,6 +203,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_wiki/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_wiki/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -139,11 +139,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
   		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -189,6 +184,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_tool_zoom/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_tool_zoom/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_tool_zoom/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -150,11 +150,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
   		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -200,6 +195,12 @@
 			<taglib-uri>csrfguard</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>
 
Index: lams_www/web/WEB-INF/web.xml
===================================================================
diff -u -rbf7188dd95898df53f786a38b116214d005c8fb2 -r2745b0e5dc858bbe667ca6f1710aaeb644626dfb
--- lams_www/web/WEB-INF/web.xml	(.../web.xml)	(revision bf7188dd95898df53f786a38b116214d005c8fb2)
+++ lams_www/web/WEB-INF/web.xml	(.../web.xml)	(revision 2745b0e5dc858bbe667ca6f1710aaeb644626dfb)
@@ -54,11 +54,6 @@
 	</error-page>
 
 	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<page-encoding>UTF-8</page-encoding>
-			<default-content-type>text/html; charset=UTF-8</default-content-type>
-  		</jsp-property-group>
   		
 		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
@@ -86,6 +81,12 @@
 			<taglib-uri>tags-lams</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
 		</taglib>
+		
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>UTF-8</page-encoding>
+			<default-content-type>text/html; charset=UTF-8</default-content-type>
+  		</jsp-property-group>
 
 	</jsp-config>