Tested get_key_from_subedge
Merge remote-tracking branch 'origin/master'

Conflicts:
	unittests/test_routing_info_model.py