Merge branch 'master' of https://github.com/CollinsIchigo/HCMP

Signed-off-by: karsanrichard <karsanrichard@gmail.com>

Conflicts:
	.htaccess
	application/controllers/national.php
Merge branch 'master' of https://github.com/HCMPKenya/HCMP

Conflicts:
	application/controllers/sms.php
Merge branch 'master' of https://github.com/HCMPKenya/HCMP
MEDS integration
Merge branch 'master' of https://github.com/HCMPKenya/HCMP
Changed the email format, bcc and cc. added a function to the users model
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP

Conflicts:
	.htaccess
	application/controllers/national.php
MEDS integration
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP
MEDS Integration
no message
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP
Data loading on selection of commodity.
Modal showing selected orders also showing

No Posting to db yet
Saving of order to newly made table sent on email
no message
Added Results as table button to stocking levels and tabs.
There is an issue however with the final tab. The tabular data is showing different results in Langata.

Signed-off-by: karsanrichard <karsanrichard@gmail.com>
First commit for feature
Merge branch 'master' of https://github.com/CollinsIchigo/HCMP

Conflicts:
	application/controllers/sms.php
	application/models/facility_stocks.php
	system/libraries/Hcmp_functions.php
Commit 2
Fixed default password issue and tested the registration process and activation

Signed-off-by: Richard Karsan <karsanrichard@gmail.com>