Merge branch 'citrus'
temporarily fix error. code needs refactoring ASAP
fix active lecture
Merge branch 'sidebar-fixes'
Merge branch 'master' into citrus