t660 Fix merge conflict
Merge branch 't660' into resolved

Conflicts:
	eScreeningDashboard/src/main/webapp/WEB-INF/views/dashboard/assessmentSummary.jsp