Index: lams_tool_survey/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2
--- lams_tool_survey/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
@@ -7,11 +7,12 @@
            				   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.survey.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" />
 </beans>
\ No newline at end of file