updated from netmon
Merge branch 'master' of
github.com:FreifunkFranken/freifunkfranken-community

Conflicts:
	ansbach.json
	erlangen.json
	fuerth.json
	haag.json
	hassberge.json
	nuernberg.json
	regensburg.json
	wuerzburg.json