6 May changes

Changes 6th May
recipients

recipients
Merge branch 'awakee_2.5' into umair

Conflicts:
	apps/bridgemail/templates/main_container.html