Merge branch 'master' into UI

Conflicts:
	Web/Areas/EarlyWarning/Views/NeedAssessment/Index.cshtml
	Web/Views/Shared/_MainMenu.cshtml
	Web/Web.config
UI conflict resolved