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
Email Notifications for Stock Outs, Expiries and Potential Expiries
Merge branch 'master' of https://github.com/HCMPKenya/HCMP
Stock Outs
Merge branch 'master' of https://github.com/HCMPKenya/HCMP
SMS Controller Changes