merging - resolving conflicts + fixing bugs
Merge branch 'master' of github.com:BaobabHealthTrust/community_vitals_registration_desktop