References #186, added panel override.
Fixes #186, added emelent to panel.
Merge branch 'master' of github.com:centre-for-educational-technology/edidaktikum