test
Merge https://github.com/cyc805/FTRerouting

Conflicts:
	src/network/model/node-id-tag.cc