Minor CMake update.
Replaced lifestuff references with client.
Merge branch 'next' into vault

Conflicts:
	CMakeLists.txt