Create basic association class
Create association views
Merge branch 'master' into PIM-1266
Merge branch 'master' into PIM-1266
Create Association normalizers
Merge branch 'master' into PIM-1266
Disable association code after creation, add behat scenarios
Fix typo
Merge pull request #374 from akeneo/PIM-1266

Create Association entity and CRUD
Merge branch 'master' into PIM-1298

Conflicts:
	src/Pim/Bundle/CatalogBundle/Resources/config/controllers.yml
	src/Pim/Bundle/CatalogBundle/Resources/config/datagrid.yml
	src/Pim/Bundle/CatalogBundle/Resources/config/form_types.yml
	src/Pim/Bundle/CatalogBundle/Resources/config/forms.yml
	src/Pim/Bundle/CatalogBundle/Resources/config/handlers.yml
	src/Pim/Bundle/CatalogBundle/Resources/config/navigation.yml
	src/Pim/Bundle/CatalogBundle/Resources/config/parameters.yml
	src/Pim/Bundle/CatalogBundle/Resources/config/routing.yml
	src/Pim/Bundle/CatalogBundle/Resources/translations/messages.en.yml