From Email and other changes
Merge branch 'tanveer_1.10' into umair_newui

Conflicts:
	apps/bridgemail/html/campaign.html
	apps/bridgemail/html/campaigns.html