Added composer.json
Merge branch 'master' into enterprise-giftcards