Resolved issues
no message
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Areas/EarlyWarning/Controllers/HRDController.cs
	Web/Areas/EarlyWarning/Views/HRD/Create.cshtml
	Web/Web.config
Merge branch 'master' of https://github.com/EdgeComputing/cats