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
Fixes mapping
Merge branch 'master' into feature/PIM-1555
Merge branch 'master' into feature/PIM-1555
Simplify one to one management
Remove Category isDynamic and isVariant from attribute
PIM-1555 Fixes media mapping
Merge branch 'master' into feature/PIM-1555

Conflicts:
	src/Pim/Bundle/ImportExportBundle/Normalizer/CategoryNormalizer.php
Restored ACL config
Remove references to unused smart and variant properties of attribute
Fix wrong translations mapping
Merge branch 'master' into feature/PIM-1555
PIM-1555 Homogeneous code and label length (thanks @filipsalpe)
Merge pull request #494 from akeneo/feature/PIM-1555

Feature/pim 1555