konflikt in markus branch
konflikt in master
Merge branch 'markus'