Merge pull request #378 from CruGlobal/MH-1024

Update gender value in the database as consistency and fix the filter by...
Do not override names when merging contacts
Merge branch 'MH-1006' into dev