PIM-1794: Remove useless use statement
PIM-1794: Rename association to association type
Refactored price import
Refactored price import
Refactored price import
PIM-1794: Fix some UT
PIM-1794: Renaming of methods/properties linked to associations
PIM-1794: Fix product edit view
PIM-1794: Clean UI
Merge branch 'master' into PIM-1794

Conflicts:
	src/Pim/Bundle/CatalogBundle/Resources/config/controllers.yml
	src/Pim/Bundle/CatalogBundle/Resources/config/datagrid.yml
	src/Pim/Bundle/CatalogBundle/Resources/config/navigation.yml
	src/Pim/Bundle/CatalogBundle/Resources/translations/messages.en.yml
	src/Pim/Bundle/CatalogBundle/Resources/views/AssociationType/edit.html.twig
	src/Pim/Bundle/CatalogBundle/Resources/views/AssociationType/index.html.twig
	src/Pim/Bundle/ImportExportBundle/Processor/ProductAssociationProcessor.php
	src/Pim/Bundle/ImportExportBundle/Resources/config/processors.yml
PIM-1794: Update CHANGELOG.md
Merge branch 'master' into task/refactor_price_import
Merge branch 'task/refactor_metric_import' into task/refactor_price_import
PIM-1794: Fix after mergeing
Merge branch 'master' into PIM-1794
PIM-1794: Fix loading fixtures
Fix php doc
PIM-1794: Fix behat scenarios
Fix typo
Merge branch 'master' into task/refactor_price_import