Behat: Also check the number of items in the locale switcher
PIM-2957 : extensibility point in product controller for user locales
Merge pull request #1286 from akeneo/PIM-2957-user-locales

PIM-2957 : extensibility point in product controller for user locales
Fix versioning of Doctrine proxies
Merge pull request #1287 from akeneo/fix/versioning

Fix versioning of Doctrine proxies
PIM-2923: Fix issue on EntityToIdentifier
PIM-2923: Add phpspec to test PIM-2923
PIM-2923: Update CHANGELOG.md
Merge pull request #1288 from akeneo/PIM-2923

PIM-2923: Fix issue on EntityToIdentifier
PIM-2900: Create a field name builder

Conflicts:
	src/Pim/Bundle/TransformBundle/DependencyInjection/PimTransformExtension.php
PIM-2900: Add comments and spec
PIM-2961: Clean code
PIM-2961: Change DI for field name builder
Merge branch 'PIM-2961' of git://github.com/akeneo/pim-community-dev into PIM-2961

Conflicts:
	src/Pim/Bundle/TransformBundle/Resources/config/builders.yml