[omnipay] fix repository url
Merge pull request #635 from mikspark/omnipay-repo-url-634

[omnipay] fix repository url in composer.lock
Polish composer.json file for CoreBundle

Refs #658
Improving the management of the collection form type
[Promotion] : Improving the management of the collection form type
[ProductOption] : Improving the management of the collection form type
[ProductProperties] : Improving the management of the collection form type
[ProductImages] : Improving the management of the collection form type
[Zone] : Improving the management of the collection form type
Fix + behat scenario improvement + translations
Fix + behat scenario improvement + translations
Merge remote-tracking branch 'remotes/a/country-collection' into feature/travis

Conflicts:
	features/backend/products.feature
	src/Sylius/Bundle/WebBundle/Resources/views/Backend/Promotion/_form.html.twig
Fix code for image collections, tried to polish product property choice type