Merge pull request #344 from CruGlobal/MH-981

Add custom labels for survey questions and custom element labels managem...
Refactor phone number selection for text messaging
Merge branch 'master' into dev
Merge branch 'MH-982' into dev