Merge branch 'zelle_gevelsberg' into develop
Merge branch 'zelle_wuppertal' into develop
Merge branch 'develop' of https://github.com/DSchmidtberg/ff-advanced into develop