Merge pull request #1 from WCC-LabTech/master

stuff
fixing inventory stuffs
Merge branch 'master' of https://github.com/csalajan/WCC-Portal-Front-end
Merge pull request #7 from csalajan/master

Updated Inventory Stuff