Updated csproj (wish VS would actually save it properly...)
Merge branch 'master' into ot