Updated Inventory Controller
Merge branch 'master' of https://github.com/C0nsultant/swtp-rebuild