Remove conflict cruft from an old merge.
Configure googletest only if testing.
Merge remote-tracking branch 'origin/master'
Add missing boost dependency.
Merge branch 'master' into sqlite

Conflicts:
	src/Externals/CMakeLists.txt