Merge pull request #357 from CruGlobal/MH-997

Mh 997
Fix cant modify frozen Hash issue
Unarchive contact after answering a survey
Merge branch 'master' into dev
Merge branch 'MH-998' into dev