Merge development into branch

Jenkinsfile

build.gradle

lib/javax.ejb.jar

lib/javax.jms.jar

lib/javax.resource.jar

lib/javax.servlet.jsp.jar

lib/javax.servlet.jsp.jstl.jar

src/main/java/nl/tudelft/ewi/queue/DatabaseLoader.java

...l/tudelft/ewi/queue/controller/ErrorControllerAdvice.java

.../java/nl/tudelft/ewi/queue/controller/RoomController.java

src/main/java/nl/tudelft/ewi/queue/model/Lab.java

...tudelft/ewi/queue/service/SAMLUserDetailsServiceImpl.java

src/main/resources/templates/admin/rooms/edit.html