Fixed CS
Corrected use statements
Merge branch 'master' of github.com:akeneo/pim-community-dev
Performance fix