Merge branch 'master' of scm.uninett.no:asm/edulab-frontend

3 jobs for master in 2 minutes and 54 seconds (queued for 1 second)