Fix org menu
Merge pull request #345 from CruGlobal/MH-985

Fix org menu
Refactor phone number selection for text messaging
Add phone_number tests
Remove message preview and improve tests
Merge branch 'MH-982' into dev