Merging branch 'master' of https://github.com/karsanrichard/HCMPv2

Conflicts:
	application/controllers/reports.php
Merging branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/controllers/reports.php
	application/views/facility/facility_reports/ajax/facility_expiry_filter_v.php
	application/views/shared_files/report_templates/side_bar_v.php
Correcting frequency of use, impact evaluation forms
Merge with Richard
import stock from v1
new thur 17th
Merge branch 'master' of https://github.com/Mureithi/HCMPv2

Conflicts:
	application/views/facility/facility_home_v.ph
f
Final for the day
Merge with Jack
fix
Merge with Adima
Finishing Merge with Adima
tweeks
making evaluation data dynamic
Merging branch 'master' of https://github.com/karsanrichard/HCMPv2

Conflicts:
	application/controllers/reports.php
Merge with Collins
Finishing
Fixing the download button
commit
import