Replaced lifestuff references with client.
Merge remote-tracking branch 'origin/next' into drive_split

Conflicts:
	include/maidsafe/drive/drive.h
	src/maidsafe/drive/root_handler.cc