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
Expiries Report and Stock Outs Report
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
Changes to the Add User Function
Changes to Add User
Merge branch 'master' of https://github.com/HCMPKenya/HCMP
SMS Controller Changes
Facility mapping corrections and RTK changes
Merge branch 'master' of https://github.com/HCMPKenya/HCMP