Inventory and patiens bugs
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/edit_patients_v.php