Updated all composer modules, and included latest work on shop and discounts