zero's non clickable badges 19-Nov-2014

Zero's doesn't click and fixes certain more issues
Merge branch 'abdullah_6.0' into _MEE

Conflicts:
	apps/bridgemail/app.js
	apps/bridgemail/campaigns/campaigns.js