[#44086525] added ability to notify activity
resolve conflict
minor commit
resolved conflicts
[#44086525] notify activities when sending a template
[#44086525] When emails are sent to a contact, it notifies activity stream
Merge remote-tracking branch 'origin/master' into 44086525-notify-activities
conflicts resolved
[#44086525] fixed hidden attributes
[#44086553] moving deliver method to ScheduledMail
[#44086553] minor change
[#44086553] scheduledMail delivers and notifies activities
[#44086553] added migration
[#44086553] minor changes
[#44086553] added fixed activity creation
update schema.rb