t728 add modal view for session timeout to be stacked over other modals
Merge branch 't714' into po_ready

Conflicts:
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/controllers/modules/moduleController.js
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/controllers/modules/modulesEditController.js
	eScreeningDashboard/src/main/webapp/resources/editors/js/app/filters/messageFilters.js
Merge branch 't660' into po_ready
t728 add modal view for session timeout to be stacked over other modals
Merge branch 'po_ready' into t728
t728 merge ticket and fix conflicts