NEW: multi delete emails
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/main/webapp/index.xhtml