PIM-2585: Remove proposal features from CE to EE
Merge branch 'grid_mongodb' of git://github.com/akeneo/pim-community-dev into grid_mongodb

Conflicts:
	src/Pim/Bundle/DataGridBundle/Resources/config/data_sources.yml