Merge branch 'PIM-3264' of github.com:akeneo/pim-community-dev into PIM-3264

* 'PIM-3264' of github.com:akeneo/pim-community-dev:
  PIM-3264: add full ORM support
  PIM-3264: Full Mongo support

Conflicts:
	src/Pim/Bundle/CatalogBundle/Doctrine/Common/EntityNotFoundException.php
	src/Pim/Bundle/CatalogBundle/Doctrine/ORM/Filter/OptionFilter.php
	src/Pim/Bundle/CatalogBundle/Doctrine/Query/FieldFilterHelper.php
Merge branch 'PIM-3264' of github.com:akeneo/pim-community-dev into PIM-3264

* 'PIM-3264' of github.com:akeneo/pim-community-dev: