estimate mail send and attachment#26sep
estimate show mail content#26sep
recurring send mail #27sep
recurring model#30sep
conflicts remove #30sep
recurring#1oct
conflicts remove#1oct
conflicts remove in multiple files#1oct
admin+offline_payment
activeadmin & dashboard#8oct
conflicts remove#8oct
Merge pull request #446 from vaibhavcisin274/prachi

Prachi