Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -r9cbba0026b9584b2e4bcba57f0d5a8510bdb5846
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 9cbba0026b9584b2e4bcba57f0d5a8510bdb5846)
@@ -54,7 +54,7 @@
 	</filter>
 	<filter>
 		<filter-name>HibernateFilter</filter-name>
-		<filter-class>org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter</filter-class>
+		<filter-class>org.springframework.orm.hibernate5.support.OpenSessionInViewFilter</filter-class>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
 			<param-value>coreSessionFactory</param-value>
@@ -73,7 +73,11 @@
 			<param-name>encoding</param-name>
 			<param-value>UTF-8</param-value>
 		</init-param>
-	</filter>
+    </filter>
+    <filter>
+        <filter-name>CSRFGuard</filter-name>
+        <filter-class>org.owasp.csrfguard.CsrfGuardFilter</filter-class>
+    </filter>
 
 	<filter-mapping>
 		<filter-name>SystemSessionFilter</filter-name>
@@ -87,6 +91,10 @@
 		<filter-name>HibernateFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
+    <filter-mapping>
+        <filter-name>CSRFGuard</filter-name>
+        <url-pattern>*.do</url-pattern>
+    </filter-mapping>
 
 	<listener>
 		<listener-class>org.lamsfoundation.lams.dbupdates.WebAppJNDIMigrationLauncherSynchronizer</listener-class>
@@ -98,24 +106,10 @@
 	</listener>
 
 	<servlet>
-		<servlet-name>action</servlet-name>
-		<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-		<init-param>
-			<param-name>config</param-name>
-			<param-value>/WEB-INF/struts-config.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>999</param-value>
-		</init-param>
-		<init-param>
-			<param-name>detail</param-name>
-			<param-value>2</param-value>
-		</init-param>
-		<init-param>
-			<param-name>validate</param-name>
-			<param-value>true</param-value>
-		</init-param>
+		<servlet-name>spring</servlet-name>
+		<servlet-class>
+			org.springframework.web.servlet.DispatcherServlet
+		</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 
@@ -134,7 +128,7 @@
 	</servlet>
 
 	<servlet-mapping>
-		<servlet-name>action</servlet-name>
+		<servlet-name>spring</servlet-name>
 		<url-pattern>*.do</url-pattern>
 	</servlet-mapping>
 
@@ -157,43 +151,13 @@
 	</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>
 
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
@@ -229,8 +193,15 @@
 		<taglib>
 			<taglib-uri>tags-lams</taglib-uri>
 			<taglib-location>/WEB-INF/tlds/lams/lams.tld</taglib-location>
-		</taglib>
+        </taglib>
 
+        <!-- ======================================================== -->
+        <!-- CSRF Guard Tag Library -->
+        <!-- ======================================================== -->
+        <taglib>
+            <taglib-uri>csrfguard</taglib-uri>
+            <taglib-location>/WEB-INF/tlds/security/csrfguard.tld</taglib-location>
+        </taglib>
 	</jsp-config>
 
 	<!-- Security Constraint -->
@@ -245,7 +216,6 @@
 		</web-resource-collection>
 		<auth-constraint>
 			<role-name>GROUP MANAGER</role-name>
-			<role-name>GROUP ADMIN</role-name>
 			<role-name>SYSADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
@@ -281,11 +251,7 @@
 		<role-name>GROUP MANAGER</role-name>
 	</security-role>
 	<security-role>
-		<description>Group Administrator</description>
-		<role-name>GROUP ADMIN</role-name>
-	</security-role>
-	<security-role>
 		<description>LAMS System Adminstrator</description>
 		<role-name>SYSADMIN</role-name>
 	</security-role>
-</web-app>
\ No newline at end of file
+</web-app>