neuer knoten
Merge branch 'master' of https://github.com/FreiFunkMuenster/gateway-ffms

Conflicts: