Fix: add a removed use in the attribute option controller
Merge pull request #1726 from akeneo/fix/removed-use-in-attribute-option-controller

Fix: add a removed use in the attribute option controller
Fix: switch timeout to 30s
Merge pull request #1729 from akeneo/fix/timeout-on-behat-scenarios

Fix: switch timeout to 30s
Revert "Fix: switch timeout to 30s"
Merge pull request #1730 from akeneo/revert-1729-fix/timeout-on-behat-scenarios

Revert "Fix: switch timeout to 30s"
PIM-3332 Remove hardcoded category class in ProductController ParamConverter

Conflicts:
	CHANGELOG.md
	src/Pim/Bundle/EnrichBundle/Controller/ProductController.php
Merge pull request #1737 from akeneo/PIM-3332

PIM-3332 Remove hardcoded category class in ProductController ParamConverter
Merge branch 'master' into PIM-3312