Windows project fixes
Merge branch 'feature-new-materials' of https://github.com/dava/dava.framework into feature-new-materials
windows project fixes