Highrise

Highrise
css changes

css changes
Merge branch 'awakeel_1.4' into umair

Conflicts:
	apps/bridgemail/crm/html/crm.html