Merge pull request #52 from Fraser999/routing_v2

Routing v2
Revert "Routing v2"
Merge pull request #53 from maidsafe/revert-52-routing_v2

Revert "Routing v2"
Merge remote-tracking branch 'origin/next' into routing_v2

Conflicts:
	include/maidsafe/rudp/managed_connections.h
	src/maidsafe/rudp/tests/test_utils.cc