Merge branch 'dev-branch' of https://git.gvk.idi.ntnu.no/Daniehoy/innoveria-bachelor into dev-branch