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
Simplify one to one management
Update changelog
Renamed workers to strategies
Added parameter setting to Javascript route translator
Added parameter setting to Javascript route translator
Added documentation
Fixed CS
Fixed CS
Fixed CS
Remove Category isDynamic and isVariant from attribute
Fix missing filters in group product datagrid and improve behat scenario