Merge commit 'a8aca8ed1be03b3405c09bfe7ab2869f31ea143a' into test
fixes in case custom folder names are defined before WkProject is called.
manual merge of subtree from wkcmake master to resolve conflict
fixed conflict about wkdoc dir
fixed conflict about wkdoc dir
Pulling subtree to get fixes on custom directories
Merge commit '26aa2208dd827598613968f52d4166706779b255' into test
Merge branch 'master' of github.com:asmodehn/wkcmake into split
Merge commit '685519e05950111776830be5e906d5607975b8a2' into test