Changes
Settings Mgmt
Stock Consumption
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	CSS/style.css
	application/views/patient_listing_v.php