With email and part of prescription activity
Merge remote-tracking branch 'origin/Emailbranch' into newOne
Merge remote-tracking branch 'origin/master' into newOne
First activity 917
Merge remote-tracking branch 'EdgarBranch2/mostUpdated851am'