User's current inventory taken into account in Shop.
Merge branch 'master' of https://github.com/SJakobsen/DIM3-Team-M