Edit user
Edit
Merge branch 'master' of https://github.com/Mureithi/HCMP-1
Commodity list
Merge branch 'master' of https://github.com/Mureithi/HCMP-1
Order excel
Merge branch 'master' of https://github.com/Mureithi/HCMP-1
Correct echo
Commodities
New Commodities
Order
Stock Level changes
Excel Order
rtk
Merge branch 'master' of https://github.com/Mureithi/HCMP-1
RTK New
Rtk dashboard
Merge branch 'master' of https://github.com/Mureithi/HCMP-1
Changes to RTK Part
Merge branch 'master' of https://github.com/HCMPKenya/HCMP

Conflicts:
	application/controllers/rtk_management.php
	application/views/rtk/rtk/partner/partner_dashboard.php
	application/views/rtk/rtk/partner/partner_stock_card.php
	application/views/rtk/rtk/partner/partner_stock_level.php
	application/views/rtk/rtk/partner/partner_stock_status.php
	application/views/rtk/rtk/partner/partner_stock_status_expiries.php