Modified csproj
Added hotfix
Added feature1
Added feature2
Merge when rebase
Merge branch 'features' of https://github.com/ghostings/testproject into features