CSS Fixes
Edit icon fixing
Merge branch 'tanveer_1.15' into contacts-dashboard

Conflicts:
	apps/bridgemail/campaigns.js
	apps/bridgemail/templates/workspace.html
	css/tan_changes.css

Date picker fixed