Merged changes for testing purposes

from https://muc.pads.ccc.de/freifunk-siteconfig