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
Merge branch 'master' into 1.0

Conflicts:
	src/Pim/Bundle/CatalogBundle/Entity/Association.php
	src/Pim/Bundle/CatalogBundle/Entity/AssociationTranslation.php
	src/Pim/Bundle/CatalogBundle/Entity/AttributeGroup.php
	src/Pim/Bundle/CatalogBundle/Entity/AttributeGroupTranslation.php
	src/Pim/Bundle/CatalogBundle/Entity/AttributeOption.php
	src/Pim/Bundle/CatalogBundle/Entity/AttributeOptionValue.php
	src/Pim/Bundle/CatalogBundle/Entity/AttributeRequirement.php
	src/Pim/Bundle/CatalogBundle/Entity/Category.php
	src/Pim/Bundle/CatalogBundle/Entity/CategoryTranslation.php
	src/Pim/Bundle/CatalogBundle/Entity/Channel.php
	src/Pim/Bundle/CatalogBundle/Entity/Completeness.php
	src/Pim/Bundle/CatalogBundle/Entity/Currency.php
	src/Pim/Bundle/CatalogBundle/Entity/Family.php
	src/Pim/Bundle/CatalogBundle/Entity/FamilyTranslation.php
	src/Pim/Bundle/CatalogBundle/Entity/Group.php
	src/Pim/Bundle/CatalogBundle/Entity/GroupTranslation.php
	src/Pim/Bundle/CatalogBundle/Entity/GroupType.php
	src/Pim/Bundle/CatalogBundle/Entity/Locale.php
	src/Pim/Bundle/CatalogBundle/Entity/PendingCompleteness.php
	src/Pim/Bundle/CatalogBundle/Entity/ProductAssociation.php
	src/Pim/Bundle/CatalogBundle/Entity/ProductAttribute.php
	src/Pim/Bundle/CatalogBundle/Entity/ProductAttributeTranslation.php
	src/Pim/Bundle/CatalogBundle/Entity/ProductPrice.php
	src/Pim/Bundle/CatalogBundle/Entity/ProductValue.php
Create a more complex behat catalog configuration for testing more complex cases
Update currencies
Improve 'apparel' behat catalog configuration to cover more cases
Merge branch 'master' into PIM-1494
Simplify behat catalog configuration
Merge branch 'master' into 1.0
Disable import product associations (beta-3)
Describe product export scenario
Merge branch 'master' into PIM-1494
PIM-1594 : add locale codes context in csv product export to export only
locales enabled on the selected channel