Several Bug Fixes and Additions Thanks to Cambell Prince
Merge branch 'cambell-prince-master-cp'
Bug Fix inventory.inc function: inventory_locations_all()