Merge pull request #551 from onaio/fix/handle-null-gender-replacement…

Merge pull request #551 from onaio/fix/handle-null-gender-replacement… #819