Validation + Search Lists not found + Merge Fields
SF/NS Login Validation
Merge branch 'tanveer1.4' into new-ui-2

Conflicts:
	apps/bridgemail/campaign.js
	apps/bridgemail/listupload/mapdata.js