Changed attribute fixtures & processors
Attribute fixtures
Merge branch 'PIM-1723' into task/PIM-1723

Conflicts:
	features/Context/catalog/apparel/attributes.yml
	features/Context/catalog/footwear/attributes.yml
	src/Pim/Bundle/ImportExportBundle/Resources/config/guessers.yml
	src/Pim/Bundle/ImportExportBundle/Transformer/ORMTransformer.php
	src/Pim/Bundle/InstallerBundle/DataFixtures/ORM/LoadAttributeData.php
	src/Pim/Bundle/InstallerBundle/DataFixtures/ORM/LoadFamilyData.php
Merge branch 'feature/PIM-1740' into task/PIM-1723

Conflicts:
	features/Context/CatalogConfigurationContext.php
	src/Pim/Bundle/ImportExportBundle/Processor/NestedFamilyProcessor.php
	src/Pim/Bundle/ImportExportBundle/Resources/config/processors.yml
	src/Pim/Bundle/ImportExportBundle/Transformer/ORMTransformer.php
Merge branch 'feature/PIM-1740' into task/PIM-1723

Conflicts:
	src/Pim/Bundle/ImportExportBundle/Transformer/ORMTransformer.php
Removed LoadAttributeData
Merge branch 'master' into task/PIM-1723

Conflicts:
	src/Pim/Bundle/InstallerBundle/DataFixtures/ORM/LoadAttributeData.php
Fixed behats
Fixed behats
Merge branch 'master' into task/PIM-1723

Conflicts:
	src/Pim/Bundle/ImportExportBundle/Transformer/ORMTransformer.php
Fixed option data
Merge branch 'master' into task/PIM-1723
Merge branch 'master' into task/PIM-1723
Fixed expected error messages in behat tests
Replace basic print_r by a one getting only the first 2 level of object
Avoid using basic print_r (in case of object) and used a limited dump
Fixed entity references
Fixed entity references
Fixed attribute option imports
[Behat] Skipped product group ordering scenario because of selenium2 bug

Drag and drop now fails