Updated csproj
Merge branch 'master' into ot