Merge branch 'master' of https://github.com/HCMPKenya/HCMP
Database Connection settings
Merge branch 'master' of https://github.com/HCMPKenya/HCMP

Conflicts:
	application/config/database.php
Weekly Stock Outs Reports
Facility Activation
Changes to fix the County Admin Percentage
National dashboard
Rtk
Mureithi
Expiries Report and Stock Outs Report
Changes to the FCDRR and Update AMC
Redistribution
Merge branch 'master' of https://github.com/HCMPKenya/HCMP
rtk
Merge branch 'master' of https://github.com/Mureithi/HCMP-1
Added Partner Admin
RTK Changes
Email Notifications for Stock Outs, Expiries and Potential Expiries
Merge branch 'master' of https://github.com/HCMPKenya/HCMP
Stock Outs