Inventory Adjustment Batches
Merge branch 'master' of https://github.com/KevinMarete/ADT
Inventory Running balances
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/views/edit_patients_v.php
Consumption bincard
Merge branch 'master' of https://github.com/jgat2012/ADT
changes