[payum] update the bundle composer.json
Fix product mapping for taxon model
Merge pull request #803 from foopang/products-by-taxons

Fix product mapping for taxon model
Merge pull request #807 from formapro-forks/payum-upgrade-to-0.7

[payum] update the bundle composer.json
Merge branch 'master' of https://github.com/Sylius/Sylius

Conflicts:
	src/Sylius/Bundle/CoreBundle/Resources/config/doctrine/model/Taxon.orm.xml