Accommodating changes to NodeId.
Merge remote-tracking branch 'origin/MAID-537' into routing_v2

Conflicts:
	src/maidsafe/rudp/connection_manager.cc
Merge remote-tracking branch 'upstream/next' into MAID-537
Merge remote-tracking branch 'origin/MAID-537' into routing_v2

Conflicts:
	src/maidsafe/rudp/connection.cc
	src/maidsafe/rudp/connection_manager.cc
Merge pull request #50 from Fraser999/MAID-537

Accommodating changes to NodeId.
Merge remote-tracking branch 'origin/next' into routing_v2
Merge remote-tracking branch 'inetic/routing_v2' into routing_v2

Conflicts:
	src/maidsafe/rudp/connection.cc
	src/maidsafe/rudp/connection_manager.cc
	src/maidsafe/rudp/core/tests/socket_test.cc
	src/maidsafe/rudp/tests/managed_connections_test.cc
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 pull request #54 from Fraser999/routing_v2

Routing v2
A fix for MSVC warning and removed unwanted #include statement.
Merge pull request #55 from Fraser999/routing_v2

A fix for MSVC warning and removed unwanted #include statement.
Merge remote-tracking branch 'origin/next' into routing_v2

Conflicts:
	include/maidsafe/rudp/managed_connections.h
	src/maidsafe/rudp/tests/test_utils.cc
Merge pull request #56 from Fraser999/routing_v2

Routing v2
Fixed compiler errors for Clang.
Merge pull request #57 from Fraser999/routing_v2

Fixed compiler errors for Clang.
Couple of async_result bugfixes.
Merge pull request #59 from Fraser999/routing_v2

Couple of async_result bugfixes.
 remove invalid typenames, small bugfixes
 Please enter the commit message for your changes. Lines starting