Changes and Fixes
Merge branch 'tanveer_n_1.20' into contacts-dashboard

Conflicts:
	apps/bridgemail/campaign.js
	apps/bridgemail/campaigns.js
	apps/shared/tags.js
	css/tan_changes.css