change

tile changes etc.
Upload Images

remove subscribers and
Merge branch 'awakeel_3.0' into umair_

Conflicts:
	apps/bridgemail/templates/main_container.html