added condition for address
Merge branch 'demographics' of https://github.com/BaobabHealthTrust/ANC into demographics