Merge pull request #233 from CruGlobal/MH-798

Make the person a contact when removed as User
Translate predefined questions for survey mode
Merge branch 'MH-793' into dev