Changes to County Admin Page
Changes to Pending Facilities and District Profile. linked the Districts on County Admin to District profile. Modified Stock Chart on District Profile
SCMLT UI Fixes
Changes to CLC interfaces
Integrated Settings Page and Fixed Modals
no message
nothing really
Merge remote-tracking branch 'Titus/master' into develop
no message
With Titus' changes for the weekend
Merge branch 'develop' of https://github.com/CodeKlerk/HCMPv2
no message
Changes to Progress Bar on CLC Profile Page
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2 into develop

Conflicts:
	application/config/database.php
Merge branch 'develop' of https://github.com/CodeKlerk/HCMPv2

Conflicts:
	.gitignore fix
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	application/config/database.php