[Argha] merging latest changes on master into south_sudan
[Argha] merging latest changes on master into south_sudan

unicefuganda/ureport,unicefuganda/ureport,unicefuganda/ureport,mbanje/ureport_uganda,mbanje/ureport_uganda