Various updates to the sample clients.
Fixed a bug where FolderFileStorage wasn't expanding |DataDirectory|.