PIM-1555 Switch all entities from bundle as it's atomic (either all annotations or all file mapping)

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/Category.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/Product.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
Fixing relationships
PIM-1555 Mapping cleanup
PIM-1555 Restoring lost config
Added missing method to interface
Fixes mapping
Merge branch 'master' into feature/PIM-1555
Added CustomEntityBundle
Merge branch 'master' into feature/PIM-1555
Clean up code
Simplify one to one management
PIM-1463 : add a second step to product import to deal with associations
PIM-1463 : add product association processor
PIM-1463 : declare product association processor and writer
PIM-1463 : refactor product association processor
PIM-1463 : remove useless statement
Update changelog
Merge pull request #489 from akeneo/refactoring_normalizer

Clean up code
Merge the directoryName and fileName properties into filePath for export profiles
Update behat tests