Removed Conflict Marks
Integrated HRD with need assessment
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Services/Cats.Services.EarlyWarning/INeedAssessmentDetailService.cs
	Services/Cats.Services.EarlyWarning/NeedAssessmentDetailService.cs
	Web/Areas/EarlyWarning/Controllers/HRDController.cs
	Web/Areas/EarlyWarning/Views/Contribution/Create.cshtml
	Web/Areas/EarlyWarning/Views/Contribution/Details.cshtml
	Web/Areas/EarlyWarning/Views/Contribution/Index.cshtml
	Web/Areas/EarlyWarning/Views/HRD/Create.cshtml
	Web/Areas/EarlyWarning/Views/NeedAssessment/Index.cshtml
Sync databse table scripts
Merge branch 'master' of https://github.com/EdgeComputing/cats
merge