Merge remote-tracking branch 'dava/development' into DF-651_DDev
[DF-651] fix for win
[DF-651] fix linking for xcode
[DF-651] Merge