Resolving conflict
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop
Adding chewa language
Merge branch 'master' of https://github.com/BaobabHealthTrust/community_vitals_registration_desktop