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
Merge pull request #60 from dirvine/routing_v2

 remove invalid typenames, small bugfixes
The rudp::test::SetupNetwork function should work again
Merge branch 'routing_v2' of github.com:maidsafe/MaidSafe-RUDP into routing_v2

Conflicts:
	include/maidsafe/rudp/managed_connections.h
	include/maidsafe/rudp/types.h
	src/maidsafe/rudp/tests/test_utils.cc
Merge remote-tracking branch 'upstream/next' into routing_v2

Conflicts:
	src/maidsafe/rudp/managed_connections.cc
Merge remote-tracking branch 'upstream/routing_v2' into routing_v2
Prunes old commented out code mostly
Fixed typo.
Receiving again, but received data is gibberish
Merge remote-tracking branch 'inetic/routing_v2' into routing_v2
Bugfix to pass the decrypted message rather than encrypted in the OnMessageSlot.