Emailing and Texting for Groups and Labels
Fix conflicts after merging MH-560 to dev