Index: lams_tool_assessment/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_assessment/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
            				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
            				   http://www.springframework.org/schema/context 
    						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
-	<context:component-scan base-package="org.lamsfoundation.lams.tool.assessment.web.controller" />
-	
-	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="prefix" value="/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
+   						   
+   	<!-- This bean initialises controller scanning. 
+   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
+	<bean
+		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
+		
+	<context:component-scan
+		base-package="org.lamsfoundation.lams.tool.assessment.web.controller" />
 </beans>
\ No newline at end of file