First ui change
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Views/Shared/_MainMenu.cshtml
	Web/Web.config
Early warning Dashbord
Early warning Gift Certificate Draft & Approved
Early warning Gift Certificate Edit ,Detail, approval
Early warning => gift certificate full
Merge branch 'master' of https://github.com/EdgeComputing/cats into UI

Conflicts:
	Web/Web.config
ui last branch
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Areas/EarlyWarning/Views/NeedAssessment/Index.cshtml
	Web/Views/Shared/_MainMenu.cshtml
	Web/Web.config
Merge branch 'master' into UI

Conflicts:
	Web/Areas/EarlyWarning/Views/NeedAssessment/Index.cshtml
	Web/Views/Shared/_MainMenu.cshtml
	Web/Web.config
Merge commit '99e1e3fe5b0b0c77650335df1fe74196b56defcb'

Conflicts:
	Web/Areas/EarlyWarning/Views/NeedAssessment/Index.cshtml
	Web/Views/Shared/_MainMenu.cshtml
	Web/Web.config
UI conflict resolved
UI conflict resolved
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Web.config
Update Web.config
fix conflict
Fix CIT-616