Merge branch 'master' of https://github.com/FreifunkBremen/ffmap-backend into FreifunkBremen-master

Conflicts:
	NodeRRD.py
	bat2nodes.py
	d3mapbuilder.py
	node.py
	nodedb.py
	rrddb.py