[PromotionBundle] The collection form type uses the new CollectionExtension
[PromotionBundle] Collection type refactoring
[PromotionBundle] Behat fixes
Add cascade to product options field (doctrine mapping)

Change cascade from all to persist
Merge pull request #2247 from steffenbrem/fix-options-persist

[Product][Easy] Add cascade to product options field (doctrine mapping)
Merge pull request #2239 from aRn0D/promotion

[PromotionBundle] The collection form type uses the new CollectionExtension
Sylius i18n
Merge pull request #2101 from gonzalovilaseca/gv-product-translation-prezent

 [WIP] [RFC] Product translation (Prezent)
Remove outdated specs, update composer.lock
Fix and merge search scenarios, run them on travis
Do not access the database during cache clearing
Fix typo in RouteProvider
Merge branch 'master' into feature/archetype

Conflicts:
	composer.lock
	src/Sylius/Bundle/ProductBundle/DependencyInjection/Configuration.php
	src/Sylius/Bundle/ProductBundle/Resources/config/doctrine/model/Attribute.orm.xml
	src/Sylius/Bundle/ProductBundle/Resources/config/doctrine/model/Option.orm.xml