Merge branch 'master' into oro/grid

Conflicts:
	src/Pim/Bundle/CatalogBundle/Resources/config/entities.yml
Merge branch 'oro/grid' of github.com:akeneo/pim-community-dev into oro/grid