13 May changes

changes 13 May
Recipients Changes

Recipients Changes
changes

Changes
Merge branch 'awakeel_2.6' into umair_

Conflicts:
	css/a_changes.css
	img/calender48.png
	img/check48.png
	img/download2-48.png
	img/download48.png
	img/draft48.png
	img/pause48.png
	img/play48.png
	img/setting-b.png
	img/subscriber-refresh48.png