zwischenstand
Merged 'dev'.
Finish talks-ubersicht