[#72885344] fix manual template sending

ScheduledMails#data_hash now consideres manual deliveries
Merge 72885344-manual-template-deliver-fix to master

[Completes #72885344]
[#72781332]Merge branch 'master' of https://github.com/dwaynemac/padma-mailing into 72781332-add-tags-to-templates
[#72781332]#72781332 changes in mercury js file and change text of mercury editor