further work on DataNamesAndReturnode type
Merge remote-tracking branch 'origin/vault' into data_manager

Conflicts:
	src/maidsafe/nfs/client/messages.cc
Minor updates.