Merge branch 'Sprint/2020-01' into 'master'

src/Project.Tests/Project.Tests.csproj

src/Project.Tests/ResourceControllerTests.cs

src/Project.Tests/app.config

src/Project.Tests/packages.config

src/Project/App.config

src/Project/Controllers/DataSourceController.cs

src/Project/Controllers/ProjectController.cs

src/Project/Controllers/ResourceController.cs

src/Project/Controllers/ResourceTypeController.cs

src/Project/Controllers/SubProjectController.cs

src/Project/Models/ProjectModel.cs

src/Project/Models/ResourceModel.cs

src/Project/Project.csproj

src/Project/ReturnObjects/ResourceTypeObject.cs

src/Project/packages.config