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

Conflicts:
	application/models/commodities.php
	application/views/subcounty/ajax/county_stock_level_filter_v.php
set up facility stock, get tracer item names
Merging branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/controllers/reports.php
	application/models/commodities.php
	application/models/facility_stocks_temp.php
	application/views/subcounty/ajax/county_stock_level_filter_v.php
Merging
 branch 'master' of https://github.com/karsanrichard/HCMPv2

Conflicts:
	application/controllers/reports.php
	application/models/facility_stocks_temp.php
fixed edit facility stocks error
Merge branch 'master' of https://github.com/karsanrichard/HCMPv2
Merging branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/controllers/reports.php
new divisional reports for facility level
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/models/commodities.php
stocking levels modified graph
merging with collins
Merging branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/controllers/reports.php
	application/models/facility_stocks.php
	application/views/shared_files/report_templates/side_bar_v.php
Merging branch 'master' of https://github.com/RiscaJack/HCMPv2

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

Conflicts:
	application/controllers/home.php
Dynamic array-facility stocks temp
Parameter passing correction, district level
PATCO
Merging branch 'master' of https://github.com/CollinsIchigo/HCMPv2

Conflicts:
	application/controllers/reports.php
Merge with Adima