NodeId::TypeId now an enum class with int_64t as base type
Merge branch 'next' into tesing_extnding_close_nodes

Conflicts:
	src/maidsafe/routing/tests/routing_algorithm_test.cc