Merge branch 'master' of https://github.com/RiscaJack/HCMPv2 into feature/User_Management
Loader+change password
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2 into feature/User_Management

Conflicts:
	application/models/facility_stocks.php
changes
Merge branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/controllers/reports.php
	application/models/facility_stocks.php
Change password
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
stage 1
Merge branch 'feature/User_Management'
Merge branch 'master' of https://github.com/Mureithi/HCMPv2
Merge with Mureithi