feature 11 12
Merge branch 'feature-open_seminar-11' into develop