Merge branch 'mainline' of gitlab.leigh-co.com:leighco/minecraft-sites/quickshop-price-list into mainline