mapping remove button changes
Tags feature and new layout implementation in csvupload and validation
errors.
Merge branch 'tanveer_1.8' into umair_newui

Conflicts:
	apps/bridgemail/campaign.js
	apps/bridgemail/html/campaign.html
	apps/bridgemail/templates/common/header.html
	apps/shared/mapping.js
	css/style.css
	css/tan_changes.css