Changed to match updated CMake functions.
Merge pull request #7 from BSMaidSafe/next

Creates new library project to link to drive demo and adds a reference c...
Merge remote-tracking branch 'origin/protoc_update' into next

Conflicts:
	CMakeLists.txt
Variable rename and test fix.