Change association datagrid to yml - label filter not fixed yet
Merge branch 'master' into oro/grid
Change association history grid to oro implementation
Merge branch 'master' into oro/grid

Conflicts:
	src/Pim/Bundle/CatalogBundle/Controller/AssociationController.php
	src/Pim/Bundle/CatalogBundle/Resources/config/datagrid.yml
Change attribute datagrid to the new implementation
Change attribute history grid to yml
Update AttributeGroup history grid
Update category history grid
Update history datagrids
Merge branch 'master' into oro/grid
Update channel grid
Remove AuditDatagridManager
Merge remote-tracking branch 'origin/fix/merge_flexible_entity_beta5' into oro/grid
Update namespaces
Fix namespace
Start to move product grid to the new implementation
Merge branch 'master' into oro/grid
Add basic attributes to the products grid
Switch to grid upgrade branch of oro platform
Remove/disable removed functionality