Invenoty updates
Fix inventory issues
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/inventory_listing_v.php
	application/views/patient_listing_v.php
Design Changes to Unify Look n Feel
Design Fine Tuning