Merge remote-tracking branch 'origin/master' into keycloak

# Conflicts:
#	build.gradle
#	src/main/resources/application.properties

src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java

@@ -0,0 +1,14 @@
+package mops.gruppen2.controllers;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/gruppen2")
+@Controller
+public class Gruppen2Controller {
+    @GetMapping("/")
+    public String index() {
+        return "index";
+    }
+}