Merge remote-tracking branch 'upstream/next' into next
Merge branch 'next' of github.com:Fraser999/MaidSafe-Routing into next
Merge remote-tracking branch 'upstream/next' into next
Merge pull request #42 from dirvine/routing_v2

Routing v2
Merge remote-tracking branch 'origin/next' into routing_v2
Merge remote-tracking branch 'upstream/routing_v2' into routing_v2
Fixed CMakeLists.txt
Couple of minor fixes.
Merge pull request #43 from Fraser999/routing_v2

Routing v2
Merge pull request #44 from dirvine/routing_v2

Routing v2
WIP
Merge branch 'routing_v2' of github.com:dirvine/MaidSafe-Routing into routing_v2

Conflicts:
	CMakeLists.txt
Fixed CMakeLists.txt
Minor update.
Merge pull request #47 from Fraser999/routing_v2

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