Merge branch 'develop' of https://github.com/MwangiKevin/CD4 into feature/new_reports_page
New reports page
Merge remote-tracking branch 'shohiek/feature/new_reports_page' into feature/reports