Pulling subtree to get fixes on custom directories
Merge commit '26aa2208dd827598613968f52d4166706779b255' into test
Merge commit '912e40b7dce8cbc0cd5f9a04ab21b70b97f3e42b' into test

Conflicts:
	ProjectC/CMake/WkBuild.cmake
	ProjectC/CMake/WkDoc.cmake
	ProjectC/CMake/WkTest.cmake
Merge commit '6e0dd1eb19796126b85146ce981d60dfec0b6be1' into test
getting rid of special windows code for dlls. This is not needed anymore, we can use the target location property instead.
Merge branch 'Ccmake'