Index: lams_tool_scratchie/web/WEB-INF/web.xml
===================================================================
diff -u -r5b9f590b301c276f8df06b30c26981b0eb634e69 -r3f3f34c22194aeaf302e1fd332925dffd35019aa
--- lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision 5b9f590b301c276f8df06b30c26981b0eb634e69)
+++ lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
@@ -16,18 +16,10 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:/org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml</param-value>
 	</context-param>
-	<context-param>
-		<param-name>locatorFactorySelector</param-name>
-		<param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
-	</context-param>
-	<context-param>
-		<param-name>parentContextKey</param-name>
-		<param-value>context.central</param-value>
-	</context-param>
 
 	<listener>
 		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
+			org.lamsfoundation.lams.web.filter.LamsContextLoaderListener
 		</listener-class>
 	</listener>
 
@@ -36,6 +28,7 @@
 		<filter-class>
 			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
+		<async-supported>true</async-supported>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
 			<param-value>coreSessionFactory</param-value>
@@ -47,12 +40,14 @@
 		<filter-class>
 			org.lamsfoundation.lams.web.session.SystemSessionFilter
 		</filter-class>
+		<async-supported>true</async-supported>
 	</filter>
 	<filter>
 		<filter-name>LocaleFilter</filter-name>
 		<filter-class>
 			org.lamsfoundation.lams.web.filter.LocaleFilter
 		</filter-class>
+		<async-supported>true</async-supported>
 		<init-param>
 			<param-name>encoding</param-name>
 			<param-value>UTF-8</param-value>
@@ -61,29 +56,39 @@
 	<filter>
 		<filter-name>CSRFGuard</filter-name>
 		<filter-class>org.owasp.csrfguard.CsrfGuardFilter</filter-class>
+		<async-supported>true</async-supported>
 	</filter>
 
 	<filter-mapping>
 		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+        <dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 	<filter-mapping>
 		<filter-name>SystemSessionFilter</filter-name>
 		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+        <dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 	<filter-mapping>
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+        <dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 	<filter-mapping>
 		<filter-name>CSRFGuard</filter-name> 
 		<url-pattern>*.do</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+        <dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 
 
 	<servlet>
 		<servlet-name>populateMarks</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.tool.scratchie.web.servlet.PopulateMarksServlet</servlet-class>
+		<async-supported>true</async-supported>
 	</servlet>
 
 	<servlet>
@@ -92,6 +97,7 @@
 			org.springframework.web.servlet.DispatcherServlet
 		</servlet-class>
 		<load-on-startup>1</load-on-startup>
+		<async-supported>true</async-supported>
 	</servlet>
 
 	<servlet>
@@ -106,6 +112,7 @@
 			<param-value>false</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
+		<async-supported>true</async-supported>
 	</servlet>
 
 	<!-- The download servlet, reused from the content repository jar -->
@@ -119,6 +126,7 @@
 			<param-value>scratchieToolContentHandler</param-value>
 		</init-param>
 		<load-on-startup>3</load-on-startup>
+		<async-supported>true</async-supported>
 	</servlet>
 
 	<servlet-mapping>