Merge branch 'hotfix/2.2.1' into develop
git ignore
git ignore
dashboard ui
more dashboard ui work.
New Reports Page
Merge branch 'develop' of https://github.com/MwangiKevin/CD4 into feature/new_reports_page
Merge remote-tracking branch 'shohiek/feature/new_reports_page' into feature/reports
RPT
fixed user_filter reset problem
added font-awesome
Merge branch 'develop' into feature/reports
New reports page
Merge remote-tracking branch 'shohiek/feature/new_reports_page' into feature/reports
height on charts
Merge branch 'feature/ui' into feature/charts

Conflicts:
	application/modules/home/controllers/home.php
New report page
charts
Merge remote-tracking branch 'shohiek/feature/new_reports_page' into feature/reports
poc homepage ui