Changes to match updates in NFS.
Merge remote-tracking branch 'origin/next' into vault
Another fix for MSVC errors.
Merge remote-tracking branch 'origin/next' into drive_split

Conflicts:
	include/maidsafe/drive/directory_handler.h
	include/maidsafe/drive/root_handler.h