Merge branch 'master' of https://github.com/RiscaJack/HCMPv2
Second Commit
Merge branch 'master' of https://github.com/Mureithi/HCMPv2
Updated
Merged Monday
Merging before easter
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2

Conflicts:
	application/controllers/home.php
	application/controllers/reports.php
	application/models/commodities.php
	application/models/facility_stocks.php
	application/views/facility/facility_reports/reports_v.php
Pull from Mureithi
New
password recovery
Merged changes
After Easter
Evaluation Reports - Facility Level
Facility Statistics
Edited Reports
After Conflicts with RiscaJack
Functions
New
Final for today
Merge with Jack