Merge commit '6fc1423124def6343a0aeb456c2af269e744b18d' into FreifunkBremen-master

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