Changes to match updates in NFS.
Merge remote-tracking branch 'origin/next' into vault
Another fix for MSVC errors.
another test 'fix'
disallow empty file creation in tests that read files
Merge branch 'refactor' into drive_split
Update for non windows compile :-)
Re-enable program options and added WIN32 sections, requires testing
runs drive and tests, drvie segfaults so requires some work in
unix_drive.
switching unix_drive to default main
Merge remote-tracking branch 'origin/next' into drive_split

Conflicts:
	include/maidsafe/drive/directory_handler.h
	include/maidsafe/drive/root_handler.h
Merge remote-tracking branch 'origin/refactor' into drive_split

Conflicts:
	src/maidsafe/drive/local/local_drive.cc
	src/maidsafe/drive/tests/filesystem_test.cc
Fixed filesystem_test compiler error on MSVC.
Added CBFS GUID to preprocessor definitions to avoid having different Drive constructors for Windows and Unix.
Changed to use new Common functions.
Drive and FilesystemTest fixes.
Tidup.
Tidy-up work.
Added file versions to directory listing.