Added phpdoc configuration file
Fix be simple soap version
Merge branch '1.0' of github.com:akeneo/pim-community-dev into 1.0
Allow importing only one product price

Conflicts:
	features/import/execute_a_job.feature
	src/Pim/Bundle/ImportExportBundle/Converter/ProductValueConverter.php
	src/Pim/Bundle/ImportExportBundle/Tests/Unit/Converter/ProductValueConverterTest.php
Merge branch 'master' into 1.0

Conflicts:
	phpdoc.xml.dist
Merge branch '1.0' of github.com:akeneo/pim-community-dev into 1.0

Conflicts:
	composer.lock
	features/import/import_products.feature
	src/Pim/Bundle/ImportExportBundle/Converter/ProductValueConverter.php
	src/Pim/Bundle/ImportExportBundle/Tests/Unit/Converter/ProductValueConverterTest.php
Merge branch 'master' into 1.0
Fixed PIM-1495
Added ExclusionPolicy to all entities

Conflicts:
	src/Pim/Bundle/CatalogBundle/Entity/AssociationTranslation.php
	src/Pim/Bundle/CatalogBundle/Entity/AttributeGroupTranslation.php
	src/Pim/Bundle/CatalogBundle/Entity/CategoryTranslation.php
	src/Pim/Bundle/CatalogBundle/Entity/FamilyTranslation.php
	src/Pim/Bundle/CatalogBundle/Entity/GroupTranslation.php
	src/Pim/Bundle/CatalogBundle/Entity/ProductAttributeTranslation.php
Update CHANGELOG.md
Improve behat step description
Add DE translations
Add FR translations
Add NL translations
Merge branch 'master' of github.com:akeneo/pim-community-dev
PIM-1596 : Show column groups in product datagrid
Merge pull request #504 from akeneo/PIM-1596

PIM-1596 : Show column groups in product datagrid
Add FR translations
Add DE translations
Add FR translations