Oppdatert dato for workshop academy
Merge branch 'master' into cfp

* master:
  Oppdatert dato for workshop academy