Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4 -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 24f0886e73317ee6aa7b49eb70e3c2ad8c8f35f4)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
@@ -41,6 +41,14 @@
 		<param-name>parentContextKey</param-name>
 		<param-value>context.central</param-value>
 	</context-param>
+	<context-param>
+        <param-name>Owasp.CsrfGuard.Config</param-name>
+        <param-value>WEB-INF/Owasp.CsrfGuard.properties</param-value>
+    </context-param>
+    <context-param>
+        <param-name>Owasp.CsrfGuard.Config.Print</param-name>
+        <param-value>true</param-value>
+    </context-param>
 
 	<filter>
 		<filter-name>UrlRewriteFilter</filter-name>
@@ -69,6 +77,10 @@
 			org.lamsfoundation.lams.web.filter.LocaleFilter
 		</filter-class>
 	</filter>
+	<filter>
+		<filter-name>CSRFGuard</filter-name>
+		<filter-class>org.owasp.csrfguard.CsrfGuardFilter</filter-class>
+	</filter>
 
 	<filter-mapping>
 		<filter-name>UrlRewriteFilter</filter-name>
@@ -147,7 +159,12 @@
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>/ckeditor/*</url-pattern>
 	</filter-mapping>
-	
+	<filter-mapping>
+		<filter-name>CSRFGuard</filter-name> 
+		<url-pattern>*.do</url-pattern>
+	</filter-mapping>
+
+
 	<listener>
 		<listener-class>
 			org.springframework.web.context.ContextLoaderListener
@@ -160,6 +177,13 @@
 		</listener-class>
 	</listener>
 
+	<listener>
+        <listener-class>org.owasp.csrfguard.CsrfGuardServletContextListener</listener-class>
+    </listener>
+     <listener>
+        <listener-class>org.owasp.csrfguard.CsrfGuardHttpSessionListener</listener-class>
+    </listener>
+
 	<servlet>
 		<servlet-name>GetRecordingServlet</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.webservice.GetRecordingServlet
@@ -497,6 +521,9 @@
 		<url-pattern>/services/SPEnrolment</url-pattern>
 	</servlet-mapping>
 	
+
+	
+	
 	<mime-mapping>
 		<extension>csv</extension>
 		<mime-type>text/plain</mime-type>
@@ -521,6 +548,11 @@
 	</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 -->
@@ -560,6 +592,13 @@
 			<taglib-uri>tags-lams</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
 		</taglib>
+		<!-- ======================================================== -->
+		<!-- CSRF Guard Tag Library -->
+		<!-- ======================================================== -->
+		<taglib>
+			<taglib-uri>csrfguard</taglib-uri>
+			<taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
+		</taglib>
 
 	</jsp-config>