Bugfixes
merge only
Merge remote-tracking branch 'maidsafe/routing_v2' into routing_v2

Conflicts:
	src/maidsafe/routing/routing_table.cc