PIM-3406: add a filter on enabled
Merge pull request #1818 from akeneo/PIM-3406

PIM-3406: Add a behat scenario to test boolean filter on field
PIM-3430: Fix doctrine issue on prices when skip item during product import
Merge pull request #1821 from akeneo/PIM-3430

PIM-3430: Fix doctrine issue on prices when skip item during product imp...
PIM-3358 : fix sprintf issue and add doctrine writer spec
Merge pull request #1822 from akeneo/PIM-3358

PIM-3358 : fix sprintf issue and add doctrine writer spec
Merge branch 'master' into PIM-3430-3406-3358-to-master
Merge pull request #1824 from akeneo/PIM-3430-3406-3358-to-master

Merge PIM-3430 PIM-3406 PIM-3358 to master
PIM-3326-stable : Fix mongo db filter with multiple filters and add behat for that kind of problem.
PIM-3326-stable : Adapt behat for stable branch
Merge pull request #1828 from akeneo/PIM-3326-stable

Pim 3326 stable: Fix mongo filters with multiples values and empty
PIM-3326: Merge 1.2 into master
PIM-3326: Merge 1.2 into master
Merge branch 'PIM-3326' into PIM-3326-merge-to-master

* PIM-3326: Correct mongo db filter with multiple selections of the same type of filers and add tests for main theses cases.

Conflicts:
	features/product/filtering/filter_products_per_with_multiple_multiselect.feature
	features/product/filtering/filter_products_per_with_multiple_prices.feature
	features/product/filtering/filter_products_per_with_multiple_simpleselect.feature
	src/Pim/Bundle/CatalogBundle/Doctrine/MongoDBODM/Filter/OptionsFilter.php
PIM-3326: Adapt change from merge
Update platform ref
PIM-3423 Move oro datagrid js to pim
PIM-3426: Fix edit common attributes
Merge pull request #1820 from akeneo/PIM-3426

PIM-3426: Fix edit common attributes
PIM-3326: Fix behat filter_products_per_family.feature