Merge branch 'dev' into 'master'

Dev

See merge request !1

public/settings.js

@@ -189,6 +189,30 @@ let settings = {
           profile: "https://www.hft-stuttgart.de/p/hadi-adineh"
         }
       ]
+    },
+    {
+      name: "Tim Herbst",
+      avatar: `${BASE_URL}/assets/images/Herbst.jpg`,
+      email: "tim.herbst@hft-stuttgart.de",
+      social: [
+        {
+          agent: "webpage",
+          icon: DEFAULT.social.webpage.icon,
+          profile: "https://www.hft-stuttgart.de"
+        }
+      ]
+    },
+    {
+      name: "Niko Jochim",
+      avatar: `${BASE_URL}/assets/images/Jochim.jpg`,
+      email: "niko.jochim@hft-stuttgart.de",
+      social: [
+        {
+          agent: "webpage",
+          icon: DEFAULT.social.webpage.icon,
+          profile: "https://www.hft-stuttgart.de"
+        }
+      ]
     }    
   ],