Add changed files - hope that this works out correctly
Merge branch 'ffm' of https://github.com/freifunk-ffm/ff-serv into ffm
Readd changes