changing message_id to id
Merge branch 'vault' of github.com:maidsafe/MaidSafe-Network-Filesystem into vault

Conflicts:
	include/maidsafe/nfs/message_wrapper.h