#660 Fixed incorrect Restangular configuration which hard coded server name
#660 added changes which were made during a merge to resolved
Merge branch 't660' into resolved

Conflicts:
	eScreeningDashboard/src/main/sql/sprint_25/28_springt25_template.sql
	eScreeningDashboard/src/main/sql/sprint_25/28_sprint25_template.sql
	eScreeningDashboard/src/main/sql/ticketRelatedChanges/28_springtXX_template.sql