csproj file
Merge branch 'dev' into model
Add Task Class