Reports
Style changes
Family Planning
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	CSS/style.css
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Indications
Merge branch 'master' of https://github.com/RufusMbugua/ADT
Indications
Highcharts
Other illnesses
Merge branch 'master' of https://github.com/RufusMbugua/ADT
Chronic
ADR Report
BMI Report
Settings changes
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	application/controllers/user_management.php