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
Move the flexibleentitybundle to PIM
Update namespaces
Update namespaces and variable names
Update namespaces and references
Rename files
Register the FlexibleEntityBundle in AppKernel
Change some parameters back to oro flexibleentity for compatibility
Merge branch 'master' into flexibleentity

Conflicts:
	src/Pim/Bundle/CatalogBundle/Entity/AttributeOption.php
	src/Pim/Bundle/CatalogBundle/Entity/AttributeOptionValue.php
	src/Pim/Bundle/CatalogBundle/Entity/ProductValue.php
Remove FlexibleEntityBundle from Oro Platform and update references
Update DemoBundle ref
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 flexibleentity

Conflicts:
	composer.lock
	src/Pim/Bundle/CatalogBundle/Controller/MediaController.php
	src/Pim/Bundle/CatalogBundle/Entity/ProductValue.php
	src/Pim/Bundle/CatalogBundle/Manager/MediaManager.php
	src/Pim/Bundle/CatalogBundle/MassEditAction/EditCommonAttributes.php
	src/Pim/Bundle/CatalogBundle/Tests/Unit/Entity/ProductTest.php
	src/Pim/Bundle/CatalogBundle/Tests/Unit/Entity/ProductValueTest.php
	src/Pim/Bundle/CatalogBundle/Tests/Unit/Manager/MediaManagerTest.php
	src/Pim/Bundle/CatalogBundle/Tests/Unit/Manager/ProductManagerTest.php
	src/Pim/Bundle/CatalogBundle/Validator/Constraints/FileValidator.php
	src/Pim/Bundle/ImportExportBundle/Normalizer/FlatProductNormalizer.php
	src/Pim/Bundle/ImportExportBundle/Tests/Unit/Normalizer/FlatProductNormalizerTest.php
	src/Pim/Bundle/ImportExportBundle/Tests/Unit/Processor/ProductCsvSerializerProcessorTest.php
	src/Pim/Bundle/ImportExportBundle/Tests/Unit/Transformer/Property/MediaTransformerTest.php
	src/Pim/Bundle/ImportExportBundle/Tests/Unit/Writer/ProductFileWriterTest.php
	src/Pim/Bundle/ImportExportBundle/Transformer/Property/MediaTransformer.php