[DF-2315] Fixed macos project
[DF-2349] Fixed compilation
Merge branch 'development' of https://github.com/dava/dava.framework into development