lieferant conflict commit
Merge branch 'master' of https://github.com/spti1011/swa.git