Merge branch 'java_extensions' of https://gitlab.doc.ic.ac.uk/jlp19/simplewebapp into java_extensions