Merge branch 'D532' of https://github.com/loadedcommerce/loaded7 into D532
#532 - working on simple options catalog logic