PIM-2163: Fix issue with scopable and localizable attributes
PIM-2163: Remove useless statements
PIM-2163: Add Locale class as use statement
Merge pull request #817 from akeneo/PIM-2163

PIM-2163: Fix issue on mass editing scopable fields
Merge pull request #818 from akeneo/1.0

1.0
Merge branch 'master' into bugfix/pim-2163-2

Conflicts:
	src/Pim/Bundle/EnrichBundle/MassEditAction/EditCommonAttributes.php