Merge branch 'devel_ek'
Merge branch 'devel_ek'
Merge branch 'devel_ek'
Merge branch 'devel_ek'
Merge branch 'devel_ek' of https://github.com/Querela/Praktikum-Computational-Advertising into devel_ek