Create composer.json
Update composer.json
Fix for changes to shop module
Merge branch 'patch-shop-update' into custom_aplus