t660 added support for av per surveyId
t660 added new files to support av per survey
Merge remote-tracking branch 'origin/t642' into t660

Conflicts:
	eScreeningDashboard/src/main/webapp/resources/editors/main.js
Merge branch 't123' into t660