Index: lams_common/web/WEB-INF/web.xml
===================================================================
diff -u -rf4b8fd4839b01ff049cfec7fb7cfd29b54df010e -r19c9010eff6be2e29657beed94349a978088650f
--- lams_common/web/WEB-INF/web.xml	(.../web.xml)	(revision f4b8fd4839b01ff049cfec7fb7cfd29b54df010e)
+++ lams_common/web/WEB-INF/web.xml	(.../web.xml)	(revision 19c9010eff6be2e29657beed94349a978088650f)
@@ -36,7 +36,7 @@
 	</context-param>
 
    <listener>
-      <listener-class>com.lamsinternational.lams.web.SessionListener</listener-class>
+      <listener-class>org.lamsfoundation.lams.web.SessionListener</listener-class>
    </listener>
 
 	<!--
@@ -92,7 +92,7 @@
 	<servlet>
 		<servlet-name>webauthservlet</servlet-name>
 		<servlet-class>
-			com.lamsinternational.lams.security.WebAuthServlet
+			org.lamsfoundation.lams.security.WebAuthServlet
 		</servlet-class>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
@@ -115,6 +115,16 @@
 	<session-config>
 		<session-timeout>3600</session-timeout>
 	</session-config>
+	
+	<mime-mapping>
+		<extension>csv</extension>
+		<mime-type>text/plain</mime-type>
+	</mime-mapping>
+	
+	<mime-mapping>
+		<extension>pdf</extension>
+		<mime-type>application/pdf</mime-type>
+	</mime-mapping>
 
 	<!--
 		To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
@@ -143,12 +153,42 @@
 		</taglib-location>
 	</taglib>
 	<taglib>
-		<taglib-uri>/WEB-INF/struts-template.tld</taglib-uri>
+		<taglib-uri>/WEB-INF/struts-tiles.tld</taglib-uri>
 		<taglib-location>
-			/WEB-INF/struts/struts-template.tld
+			/WEB-INF/struts/struts-tiles.tld
 		</taglib-location>
 	</taglib>
-
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-bean-el.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-bean-el.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-logic-el.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-logic-el.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-html-el.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-html-el.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-tiles-el.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-tiles-el.tld
+		</taglib-location>
+	</taglib>
+	<taglib>
+		<taglib-uri>/WEB-INF/struts-nested.tld</taglib-uri>
+		<taglib-location>
+			/WEB-INF/struts/struts-nested.tld
+		</taglib-location>
+	</taglib>
+	
 	<!-- JSTL Tag Library Defintions -->
 	<taglib>
 		<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
@@ -174,7 +214,7 @@
 		<taglib-uri>http://java.sun.com/jstl/xml_rt</taglib-uri>
 		<taglib-location>/WEB-INF/jstl/x-rt.tld</taglib-location>
 	</taglib>
-
+	
 	<!--Tomcat security config-->
 	<security-constraint>
 		<web-resource-collection>