Mostly got test projects compiling & running in cmake.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	source/CMakeLists.txt
	source/Pictus/CMakeLists.txt
	source/deps/CMakeLists.txt
Fixed some git clumsiness.