Merge branch 'Sprint/201920' into 'master'

src/Project.Tests/DefaultControllerTests.cs

src/Project.Tests/Project.Tests.csproj

src/Project.Tests/ProjectControllerTests.cs

src/Project.Tests/ResourceControllerTests.cs

src/Project.Tests/app.config

src/Project.Tests/packages.config

src/Project/App.config

src/Project/Controllers/DisciplineController.cs

src/Project/Controllers/ProjectController.cs

src/Project/Controllers/ProjectRoleController.cs

src/Project/Models/ProjectModel.cs

src/Project/Models/ResourceModel.cs

src/Project/Project.csproj

src/Project/ReturnObjects/DisciplineObject.cs

src/Project/packages.config