Merge pull request #382 from CruGlobal/MH-1030

Fixes edit surveys in profile page
Fix unnecessary filtered output when changing gender of multiple contacts in all contacts page
Merge branch 'MH-1012' into dev