next gen json
foo
Merge branch 'master' of https://github.com/kaleng/ffmap-backend

Conflicts:
	aliases.json
	d3mapbuilder.py
	link.py
	mkmap.sh
	node.py
	nodedb.py