Merge branch 'master' into 295-ldap-authentifizierung-an-active-directory

config.py.example

db.py

edit.py

icalexport.py

server.py

static/moderator.js

static/style.css

static/videojs/videojs-resolution-switcher.js

stats.py

templates/base.html

templates/course.html

templates/courses.html

templates/lecture.html

templates/macros.html

templates/stats.html

templates/timetable.html