Validation
Merge branch 'tanveer1.5' into new-ui-2

Conflicts:
	apps/bridgemail/app.js