compiling again
wip - merge commit
Merge branch 'routing_v2' of github.com:fraser999/MaidSafe-Routing into routing_v2

Conflicts:
	src/maidsafe/routing/utils.cc
Moved messages again.
Further work on messages.