Merge pull request #37 from kevinyby/develop

modify WHInventory
develop